Merge branch 'master' into Fast_PoW_unless_frozen

INSTALL.md

@@ -57,8 +57,8 @@ ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
 
 Now, install the required dependencies
 ```
-sudo port install python27 py27-pyqt4 openssl
+brew install python pyqt
-sudo port install git-core +svn +doc +bash_completion +gitweb
+brew install git
 ```
 
 Download and run PyBitmessage:

Makefile

@@ -7,7 +7,8 @@ PREFIX?=/usr/local
 all:
 debug:
 source:
-	tar -cvzf ../${APP}_${VERSION}.orig.tar.gz ../${APP}-${VERSION} --exclude-vcs
+	tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs
+	gzip -f9n ../${APP}_${VERSION}.orig.tar
 install:
 	mkdir -p ${DESTDIR}/usr
 	mkdir -p ${DESTDIR}${PREFIX}

arch.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 
+GIT_APP=PyBitmessage
 APP=pybitmessage
 PREV_VERSION=0.3.5
 VERSION=0.3.5
 RELEASE=1
-ARCH_TYPE=`uname -m`
+ARCH_TYPE=any
 CURRDIR=`pwd`
 SOURCE=archpackage/${APP}-${VERSION}.tar.gz
 
@@ -25,24 +26,12 @@ make clean
 rm -f archpackage/*.gz
 
 # having the root directory called name-version seems essential
-mv ../${APP} ../${APP}-${VERSION}
+mv ../${GIT_APP} ../${APP}-${VERSION}
 tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
 
 # rename the root directory without the version number
-mv ../${APP}-${VERSION} ../${APP}
+mv ../${APP}-${VERSION} ../${GIT_APP}
 
 # calculate the MD5 checksum
 CHECKSM=$(md5sum ${SOURCE})
 sed -i "s/md5sums[^)]*)/md5sums=(${CHECKSM%% *})/g" archpackage/PKGBUILD
-
-cd archpackage
-
-# Create the package
-tar -c -f ${APP}-${VERSION}.pkg.tar .
-sync
-xz ${APP}-${VERSION}.pkg.tar
-sync
-
-# Move back to the original directory
-cd ${CURRDIR}
-

archpackage/PKGBUILD

@@ -3,13 +3,13 @@ pkgname=pybitmessage
 pkgver=0.3.5
 pkgrel=1
 pkgdesc="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide "non-content" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs."
-arch=('i686' 'x86_64')
+arch=('any')
 url="https://github.com/Bitmessage/PyBitmessage"
 license=('MIT')
 groups=()
-depends=('python2' 'qt4' 'python2-pyqt4' 'sqlite' 'openssl' 'gst123')
+depends=('python2' 'qt4' 'python2-pyqt4' 'sqlite' 'openssl' 'mpg123')
 makedepends=()
-optdepends=('python2-gevent')
+optdepends=('python2-gevent: Python network library that uses greenlet and libevent for easy and scalable concurrency')
 provides=()
 conflicts=()
 replaces=()
@@ -19,7 +19,7 @@ install=
 changelog=
 source=($pkgname-$pkgver.tar.gz)
 noextract=()
-md5sums=()
+md5sums=(ebf89129571571198473559b4b2e552c)
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr

debian.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.3.4
+PREV_VERSION=0.3.5
 VERSION=0.3.5
 RELEASE=1
-ARCH_TYPE=`uname -m`
+ARCH_TYPE=all
 DIR=${APP}-${VERSION}
 
 if [ $ARCH_TYPE == "x86_64" ]; then

debian/changelog

@@ -14,7 +14,8 @@ pybitmessage (0.3.5-1) raring; urgency=low
   * Added Russian translation
   * Added search support in the UI
   * Added 'make uninstall'
-  * To improve OSX support, use PKCS5_PBKDF2_HMAC_SHA1 if PKCS5_PBKDF2_HMAC is unavailable
+  * To improve OSX support, use PKCS5_PBKDF2_HMAC_SHA1
+    if PKCS5_PBKDF2_HMAC is unavailable
   * Added better warnings for OSX users who are using old versions of Python
   * Repaired debian packaging
   * Altered Makefile to avoid needing to chase changes

debian/control

@@ -1,4 +1,5 @@
 Source: pybitmessage
+Section: mail
 Priority: extra
 Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
 Build-Depends: debhelper (>= 9.0.0)
@@ -7,8 +8,7 @@ Homepage: https://github.com/Bitmessage/PyBitmessage
 Vcs-Git: https://github.com/Bitmessage/PyBitmessage.git
 
 Package: pybitmessage
-Section: mail
+Architecture: all
-Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev, gst123
 Suggests: libmessaging-menu-dev
 Description: Send encrypted messages

generate.sh

@@ -26,7 +26,7 @@ packagemonkey -n "PyBitmessage" --version "0.3.5" --dir "." -l "mit" \
     --dependspuppy "openssl, python-qt4, sqlite3, sqlite3-dev, " \
     "python-openssl, python-sip, gst123" \
     --dependsarch "python2, qt4, python2-pyqt4, sqlite, openssl, gst123" \
-    --suggestsarch "python2-gevent" --pythonversion 2 \
+    --suggestsarch "python2-gevent: Python network library that uses greenlet and libevent for easy and scalable concurrency" --pythonversion 2 \
     --dependsebuild "dev-libs/openssl, dev-python/PyQt4[${PYTHON_USEDEP}]" \
     --buildebuild "\${PYTHON_DEPS}" --pythonreq "sqlite" \
     --repository "https://github.com/Bitmessage/PyBitmessage.git"

osx.sh

@@ -12,12 +12,12 @@ if [[ -z "$1" ]]; then
   exit
 fi
 
-echo "Creating OS X packages for Bitmessage. This script will ask for sudo to create the dmg volume"
+echo "Creating OS X packages for Bitmessage."
 
 cd src && python build_osx.py py2app
 
 if [[ $? = "0" ]]; then
-  sudo hdiutil create -fs HFS+ -volname "Bitmessage" -srcfolder dist/Bitmessage.app dist/bitmessage-v$1.dmg
+  hdiutil create -fs HFS+ -volname "Bitmessage" -srcfolder dist/Bitmessage.app dist/bitmessage-v$1.dmg
 else
   echo "Problem creating Bitmessage.app, stopping."
   exit

puppypackage/pybitmessage-0.3.5.pet.specs

@@ -1 +1 @@
-pybitmessage-0.3.5-1|PyBitmessage|0.3.5|1|Internet;mailnews;|7.2M||pybitmessage-0.3.5-1.pet|+openssl,+python-qt4,+sqlite3,+sqlite3-dev,+python-openssl,+python-sip,+gst123|Send encrypted messages|ubuntu|precise|5|
+pybitmessage-0.3.5-1|PyBitmessage|0.3.5|1|Internet;mailnews;|3.8M||pybitmessage-0.3.5-1.pet|+openssl,+python-qt4,+sqlite3,+sqlite3-dev,+python-openssl,+python-sip,+gst123|Send encrypted messages|ubuntu|precise|5|

rpmpackage/pybitmessage.spec

@@ -6,6 +6,7 @@ License: MIT
 URL: https://github.com/Bitmessage/PyBitmessage
 Packager: Bob Mottram (4096 bits) <bob@robotics.uk.to>
 Source0: http://yourdomainname.com/src/%{name}_%{version}.orig.tar.gz
+BuildArch: noarch
 Group: Office/Email
 
 Requires: python, PyQt4, openssl-compat-bitcoin-libs, gst123
@@ -83,7 +84,8 @@ make install -B DESTDIR=%{buildroot} PREFIX=/usr
 - Added Russian translation
 - Added search support in the UI
 - Added 'make uninstall'
-- To improve OSX support, use PKCS5_PBKDF2_HMAC_SHA1 if PKCS5_PBKDF2_HMAC is unavailable
+- To improve OSX support, use PKCS5_PBKDF2_HMAC_SHA1
+  if PKCS5_PBKDF2_HMAC is unavailable
 - Added better warnings for OSX users who are using old versions of Python
 - Repaired debian packaging
 - Altered Makefile to avoid needing to chase changes

src/addresses.py

@@ -97,13 +97,18 @@ def calculateInventoryHash(data):
     return sha2.digest()[0:32]
 
 def encodeAddress(version,stream,ripe):
-    if version >= 2:
+    if version >= 2 and version < 4:
         if len(ripe) != 20:
             raise Exception("Programming error in encodeAddress: The length of a given ripe hash was not 20.")
         if ripe[:2] == '\x00\x00':
             ripe = ripe[2:]
         elif ripe[:1] == '\x00':
             ripe = ripe[1:]
+    elif version == 4:
+        if len(ripe) != 20:
+            raise Exception("Programming error in encodeAddress: The length of a given ripe hash was not 20.")
+        ripe = ripe.lstrip('\x00')
+
     a = encodeVarint(version) + encodeVarint(stream) + ripe
     sha = hashlib.new('sha512')
     sha.update(a)
@@ -164,7 +169,7 @@ def decodeAddress(address):
     #print 'addressVersionNumber', addressVersionNumber
     #print 'bytesUsedByVersionNumber', bytesUsedByVersionNumber
 
-    if addressVersionNumber > 3:
+    if addressVersionNumber > 4:
         print 'cannot decode address version numbers this high'
         status = 'versiontoohigh'
         return status,0,0,0
@@ -191,6 +196,15 @@ def decodeAddress(address):
             return 'ripetoolong',0,0,0
         else:
             return 'otherproblem',0,0,0
+    elif addressVersionNumber == 4:
+        if len(data[bytesUsedByVersionNumber+bytesUsedByStreamNumber:-4]) > 20:
+            return 'ripetoolong',0,0,0
+        elif len(data[bytesUsedByVersionNumber+bytesUsedByStreamNumber:-4]) < 4:
+            return 'ripetooshort',0,0,0
+        else:
+            x00string = '\x00' * (20 - len(data[bytesUsedByVersionNumber+bytesUsedByStreamNumber:-4]))
+            return status,addressVersionNumber,streamNumber,x00string+data[bytesUsedByVersionNumber+bytesUsedByStreamNumber:-4]
+        
 
 def addBMIfNotPresent(address):
     address = str(address).strip()

src/bitmessagemain.py

@@ -9,13 +9,6 @@
 
 # The software version variable is now held in shared.py
 
-# import ctypes
-try:
-    from gevent import monkey
-    monkey.patch_all()
-except ImportError as ex:
-    print "Not using the gevent module as it was not found. No need to worry."
-
 import signal  # Used to capture a Ctrl-C keypress so that Bitmessage can shutdown gracefully.
 # The next 3 are used for the API
 from SimpleXMLRPCServer import *
@@ -38,10 +31,17 @@ from class_singleWorker import *
 from class_outgoingSynSender import *
 from class_singleListener import *
 from class_addressGenerator import *
+from debug import logger
 
 # Helper Functions
 import helper_bootstrap
 
+import sys
+if sys.platform == 'darwin':
+    if float("{1}.{2}".format(*sys.version_info)) < 7.5:
+        logger.critical("You should use python 2.7.5 or greater. Your version: %s", "{0}.{1}.{2}".format(*sys.version_info))
+        sys.exit(0)
+
 def connectToStream(streamNumber):
     selfInitiatedConnections[streamNumber] = {}
     if sys.platform[0:3] == 'win':
@@ -54,6 +54,13 @@ def connectToStream(streamNumber):
         a.start()
 
 
+class APIError(Exception):
+    def __init__(self, error_number, error_message):
+        self.error_number = error_number
+        self.error_message = error_message
+    def __str__(self):
+        return "API Error %04i: %s" % (self.error_number, self.error_message)
+
 # This is one of several classes that constitute the API
 # This class was written by Vaibhav Bhatia. Modified by Jonathan Warren (Atheros).
 # http://code.activestate.com/recipes/501148-xmlrpc-serverclient-which-does-cookie-handling-and/
@@ -127,20 +134,19 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             else:
                 return False
         else:
-            print 'Authentication failed because header lacks Authentication field'
+            logger.warn('Authentication failed because header lacks Authentication field')
             time.sleep(2)
             return False
 
         return False
 
-    def _dispatch(self, method, params):
+    def _decode(self, text, decode_type):
-        self.cookies = []
+        try:
-
+            return text.decode(decode_type)
-        validuser = self.APIAuthenticateClient()
+        except TypeError as e:
-        if not validuser:
+            raise APIError(22, "Decode error - " + str(e))
-            time.sleep(2)
+        
-            return "RPC Username or password incorrect or HTTP header lacks authentication at all."
+    def _handle_request(self, method, params):
-        # handle request
         if method == 'helloWorld':
             (a, b) = params
             return a + '-' + b
@@ -166,7 +172,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             return data
         elif method == 'createRandomAddress':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
             elif len(params) == 1:
                 label, = params
                 eighteenByteRipe = False
@@ -193,12 +199,12 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
                 payloadLengthExtraBytes = int(
                     shared.networkDefaultPayloadLengthExtraBytes * smallMessageDifficulty)
             else:
-                return 'API Error 0000: Too many parameters!'
+                raise APIError(0, 'Too many parameters!')
-            label = label.decode('base64')
+            label = self._decode(label, "base64")
             try:
                 unicode(label, 'utf-8')
             except:
-                return 'API Error 0017: Label is not valid UTF-8 data.'
+                raise APIError(17, 'Label is not valid UTF-8 data.')
             shared.apiAddressGeneratorReturnQueue.queue.clear()
             streamNumberForAddress = 1
             shared.addressGeneratorQueue.put((
@@ -206,7 +212,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             return shared.apiAddressGeneratorReturnQueue.get()
         elif method == 'createDeterministicAddresses':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
             elif len(params) == 1:
                 passphrase, = params
                 numberOfAddresses = 1
@@ -260,24 +266,24 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
                 payloadLengthExtraBytes = int(
                     shared.networkDefaultPayloadLengthExtraBytes * smallMessageDifficulty)
             else:
-                return 'API Error 0000: Too many parameters!'
+                raise APIError(0, 'Too many parameters!')
             if len(passphrase) == 0:
-                return 'API Error 0001: The specified passphrase is blank.'
+                raise APIError(1, 'The specified passphrase is blank.')
-            passphrase = passphrase.decode('base64')
+            passphrase = self._decode(passphrase, "base64")
             if addressVersionNumber == 0:  # 0 means "just use the proper addressVersionNumber"
                 addressVersionNumber = 3
             if addressVersionNumber != 3:
-                return 'API Error 0002: The address version number currently must be 3 (or 0 which means auto-select). ' + addressVersionNumber + ' isn\'t supported.'
+                raise APIError(2,'The address version number currently must be 3 (or 0 which means auto-select). ' + addressVersionNumber + ' isn\'t supported.')
             if streamNumber == 0:  # 0 means "just use the most available stream"
                 streamNumber = 1
             if streamNumber != 1:
-                return 'API Error 0003: The stream number must be 1 (or 0 which means auto-select). Others aren\'t supported.'
+                raise APIError(3,'The stream number must be 1 (or 0 which means auto-select). Others aren\'t supported.')
             if numberOfAddresses == 0:
-                return 'API Error 0004: Why would you ask me to generate 0 addresses for you?'
+                raise APIError(4, 'Why would you ask me to generate 0 addresses for you?')
             if numberOfAddresses > 999:
-                return 'API Error 0005: You have (accidentally?) specified too many addresses to make. Maximum 999. This check only exists to prevent mischief; if you really want to create more addresses than this, contact the Bitmessage developers and we can modify the check or you can do it yourself by searching the source code for this message.'
+                raise APIError(5, 'You have (accidentally?) specified too many addresses to make. Maximum 999. This check only exists to prevent mischief; if you really want to create more addresses than this, contact the Bitmessage developers and we can modify the check or you can do it yourself by searching the source code for this message.')
             shared.apiAddressGeneratorReturnQueue.queue.clear()
-            print 'Requesting that the addressGenerator create', numberOfAddresses, 'addresses.'
+            logger.debug('Requesting that the addressGenerator create %s addresses.', numberOfAddresses)
             shared.addressGeneratorQueue.put(
                 ('createDeterministicAddresses', addressVersionNumber, streamNumber,
                  'unused API address', numberOfAddresses, passphrase, eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes))
@@ -291,19 +297,19 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             return data
         elif method == 'getDeterministicAddress':
             if len(params) != 3:
-                return 'API Error 0000: I need exactly 3 parameters.'
+                raise APIError(0, 'I need exactly 3 parameters.')
             passphrase, addressVersionNumber, streamNumber = params
             numberOfAddresses = 1
             eighteenByteRipe = False
             if len(passphrase) == 0:
-                return 'API Error 0001: The specified passphrase is blank.'
+                raise APIError(1, 'The specified passphrase is blank.')
-            passphrase = passphrase.decode('base64')
+            passphrase = self._decode(passphrase, "base64")
             if addressVersionNumber != 3:
-                return 'API Error 0002: The address version number currently must be 3. ' + addressVersionNumber + ' isn\'t supported.'
+                raise APIError(2, 'The address version number currently must be 3. ' + addressVersionNumber + ' isn\'t supported.')
             if streamNumber != 1:
-                return 'API Error 0003: The stream number must be 1. Others aren\'t supported.'
+                raise APIError(3, ' The stream number must be 1. Others aren\'t supported.')
             shared.apiAddressGeneratorReturnQueue.queue.clear()
-            print 'Requesting that the addressGenerator create', numberOfAddresses, 'addresses.'
+            logger.debug('Requesting that the addressGenerator create %s addresses.', numberOfAddresses)
             shared.addressGeneratorQueue.put(
                 ('getDeterministicAddress', addressVersionNumber,
                  streamNumber, 'unused API address', numberOfAddresses, passphrase, eighteenByteRipe))
@@ -343,8 +349,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             return data
         elif method == 'getInboxMessageById' or method == 'getInboxMessageByID':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
-            msgid = params[0].decode('hex')
+            msgid = self._decode(params[0], "hex")
             v = (msgid,)
             shared.sqlLock.acquire()
             shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, received, message, encodingtype, read FROM inbox WHERE msgid=?''')
@@ -391,7 +397,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             return data
         elif method == 'getInboxMessagesByReceiver' or method == 'getInboxMessagesByAddress': #after some time getInboxMessagesByAddress should be removed
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
             toAddress = params[0]
             v = (toAddress,)
             shared.sqlLock.acquire()
@@ -411,8 +417,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             return data
         elif method == 'getSentMessageById' or method == 'getSentMessageByID':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
-            msgid = params[0].decode('hex')
+            msgid = self._decode(params[0], "hex")
             v = (msgid,)
             shared.sqlLock.acquire()
             shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, lastactiontime, message, encodingtype, status, ackdata FROM sent WHERE msgid=?''')
@@ -429,7 +435,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
                 return data
         elif method == 'getSentMessagesByAddress' or method == 'getSentMessagesBySender':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
             fromAddress = params[0]
             v = (fromAddress,)
             shared.sqlLock.acquire()
@@ -449,8 +455,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             return data
         elif method == 'getSentMessageByAckData':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
-            ackData = params[0].decode('hex')
+            ackData = self._decode(params[0], "hex")
             v = (ackData,)
             shared.sqlLock.acquire()
             shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, lastactiontime, message, encodingtype, status, ackdata FROM sent WHERE ackdata=?''')
@@ -467,8 +473,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             return data
         elif method == 'trashMessage':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
-            msgid = params[0].decode('hex')
+            msgid = self._decode(params[0], "hex")
             
             # Trash if in inbox table
             helper_inbox.trash(msgid)
@@ -484,14 +490,14 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             return 'Trashed message (assuming message existed).'
         elif method == 'trashInboxMessage':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
-            msgid = params[0].decode('hex')
+            msgid = self._decode(params[0], "hex")
             helper_inbox.trash(msgid)
             return 'Trashed inbox message (assuming message existed).'
         elif method == 'trashSentMessage':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
-            msgid = params[0].decode('hex')
+            msgid = self._decode(params[0], "hex")
             t = (msgid,)
             shared.sqlLock.acquire()
             shared.sqlSubmitQueue.put('''UPDATE sent SET folder='trash' WHERE msgid=?''')
@@ -501,61 +507,72 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             shared.sqlLock.release()
             # shared.UISignalQueue.put(('removeSentRowByMsgid',msgid)) This function doesn't exist yet.
             return 'Trashed sent message (assuming message existed).'
+        elif method == 'trashSentMessageByAckData':
+            # This API method should only be used when msgid is not available
+            if len(params) == 0:
+                raise APIError(0, 'I need parameters!')
+            ackdata = self._decode(params[0], "hex")
+            t = (ackdata,)
+            shared.sqlLock.acquire()
+            shared.sqlSubmitQueue.put('''UPDATE sent SET folder='trash' WHERE ackdata=?''')
+            shared.sqlSubmitQueue.put(t)
+            shared.sqlReturnQueue.get()
+            shared.sqlSubmitQueue.put('commit')
+            shared.sqlLock.release()
+            return 'Trashed sent message (assuming message existed).'
         elif method == 'sendMessage':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
             elif len(params) == 4:
                 toAddress, fromAddress, subject, message = params
                 encodingType = 2
             elif len(params) == 5:
                 toAddress, fromAddress, subject, message, encodingType = params
             if encodingType != 2:
-                return 'API Error 0006: The encoding type must be 2 because that is the only one this program currently supports.'
+                raise APIError(6, 'The encoding type must be 2 because that is the only one this program currently supports.')
-            subject = subject.decode('base64')
+            subject = self._decode(subject, "base64")
-            message = message.decode('base64')
+            message = self._decode(message, "base64")
             status, addressVersionNumber, streamNumber, toRipe = decodeAddress(
                 toAddress)
             if status != 'success':
-                with shared.printLock:
+                logger.warn('API Error 0007: Could not decode address %s. Status: %s.', toAddress, status)
-                    print 'API Error 0007: Could not decode address:', toAddress, ':', status
 
                 if status == 'checksumfailed':
-                    return 'API Error 0008: Checksum failed for address: ' + toAddress
+                    raise APIError(8, 'Checksum failed for address: ' + toAddress)
                 if status == 'invalidcharacters':
-                    return 'API Error 0009: Invalid characters in address: ' + toAddress
+                    raise APIError(9, 'Invalid characters in address: ' + toAddress)
                 if status == 'versiontoohigh':
-                    return 'API Error 0010: Address version number too high (or zero) in address: ' + toAddress
+                    raise APIError(10, 'Address version number too high (or zero) in address: ' + toAddress)
-                return 'API Error 0007: Could not decode address: ' + toAddress + ' : ' + status
+                raise APIError(7, 'Could not decode address: ' + toAddress + ' : ' + status)
             if addressVersionNumber < 2 or addressVersionNumber > 3:
-                return 'API Error 0011: The address version number currently must be 2 or 3. Others aren\'t supported. Check the toAddress.'
+                raise APIError(11, 'The address version number currently must be 2 or 3. Others aren\'t supported. Check the toAddress.')
             if streamNumber != 1:
-                return 'API Error 0012: The stream number must be 1. Others aren\'t supported. Check the toAddress.'
+                raise APIError(12, 'The stream number must be 1. Others aren\'t supported. Check the toAddress.')
             status, addressVersionNumber, streamNumber, fromRipe = decodeAddress(
                 fromAddress)
             if status != 'success':
-                with shared.printLock:
+                logger.warn('API Error 0007: Could not decode address %s. Status: %s.', fromAddress, status)
-                    print 'API Error 0007: Could not decode address:', fromAddress, ':', status
 
                 if status == 'checksumfailed':
-                    return 'API Error 0008: Checksum failed for address: ' + fromAddress
+                    raise APIError(8, 'Checksum failed for address: ' + fromAddress)
                 if status == 'invalidcharacters':
-                    return 'API Error 0009: Invalid characters in address: ' + fromAddress
+                    raise APIError(9, 'Invalid characters in address: ' + fromAddress)
                 if status == 'versiontoohigh':
-                    return 'API Error 0010: Address version number too high (or zero) in address: ' + fromAddress
+                    raise APIError(10, 'Address version number too high (or zero) in address: ' + fromAddress)
-                return 'API Error 0007: Could not decode address: ' + fromAddress + ' : ' + status
+                raise APIError(7, 'Could not decode address: ' + fromAddress + ' : ' + status)
             if addressVersionNumber < 2 or addressVersionNumber > 3:
-                return 'API Error 0011: The address version number currently must be 2 or 3. Others aren\'t supported. Check the fromAddress.'
+                raise APIError(11, 'The address version number currently must be 2 or 3. Others aren\'t supported. Check the fromAddress.')
             if streamNumber != 1:
-                return 'API Error 0012: The stream number must be 1. Others aren\'t supported. Check the fromAddress.'
+                raise APIError(12, 'The stream number must be 1. Others aren\'t supported. Check the fromAddress.')
             toAddress = addBMIfNotPresent(toAddress)
             fromAddress = addBMIfNotPresent(fromAddress)
             try:
                 fromAddressEnabled = shared.config.getboolean(
                     fromAddress, 'enabled')
             except:
-                return 'API Error 0013: Could not find your fromAddress in the keys.dat file.'
+                raise APIError(13, 'Could not find your fromAddress in the keys.dat file.')
             if not fromAddressEnabled:
-                return 'API Error 0014: Your fromAddress is disabled. Cannot send.'
+                raise APIError(14, 'Your fromAddress is disabled. Cannot send.')
 
             ackdata = OpenSSL.rand(32)
 
@@ -584,40 +601,39 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
 
         elif method == 'sendBroadcast':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
             if len(params) == 3:
                 fromAddress, subject, message = params
                 encodingType = 2
             elif len(params) == 4:
                 fromAddress, subject, message, encodingType = params
             if encodingType != 2:
-                return 'API Error 0006: The encoding type must be 2 because that is the only one this program currently supports.'
+                raise APIError(6, 'The encoding type must be 2 because that is the only one this program currently supports.')
-            subject = subject.decode('base64')
+            subject = self._decode(subject, "base64")
-            message = message.decode('base64')
+            message = self._decode(message, "base64")
 
             status, addressVersionNumber, streamNumber, fromRipe = decodeAddress(
                 fromAddress)
             if status != 'success':
-                with shared.printLock:
+                logger.warn('API Error 0007: Could not decode address %s. Status: %s.', fromAddress, status)
-                    print 'API Error 0007: Could not decode address:', fromAddress, ':', status
 
                 if status == 'checksumfailed':
-                    return 'API Error 0008: Checksum failed for address: ' + fromAddress
+                    raise APIError(8, 'Checksum failed for address: ' + fromAddress)
                 if status == 'invalidcharacters':
-                    return 'API Error 0009: Invalid characters in address: ' + fromAddress
+                    raise APIError(9, 'Invalid characters in address: ' + fromAddress)
                 if status == 'versiontoohigh':
-                    return 'API Error 0010: Address version number too high (or zero) in address: ' + fromAddress
+                    raise APIError(10, 'Address version number too high (or zero) in address: ' + fromAddress)
-                return 'API Error 0007: Could not decode address: ' + fromAddress + ' : ' + status
+                raise APIError(7, 'Could not decode address: ' + fromAddress + ' : ' + status)
             if addressVersionNumber < 2 or addressVersionNumber > 3:
-                return 'API Error 0011: the address version number currently must be 2 or 3. Others aren\'t supported. Check the fromAddress.'
+                raise APIError(11, 'the address version number currently must be 2 or 3. Others aren\'t supported. Check the fromAddress.')
             if streamNumber != 1:
-                return 'API Error 0012: the stream number must be 1. Others aren\'t supported. Check the fromAddress.'
+                raise APIError(12, 'the stream number must be 1. Others aren\'t supported. Check the fromAddress.')
             fromAddress = addBMIfNotPresent(fromAddress)
             try:
                 fromAddressEnabled = shared.config.getboolean(
                     fromAddress, 'enabled')
             except:
-                return 'API Error 0013: could not find your fromAddress in the keys.dat file.'
+                raise APIError(13, 'could not find your fromAddress in the keys.dat file.')
             ackdata = OpenSSL.rand(32)
             toAddress = '[Broadcast subscribers]'
             ripe = ''
@@ -635,14 +651,15 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             return ackdata.encode('hex')
         elif method == 'getStatus':
             if len(params) != 1:
-                return 'API Error 0000: I need one parameter!'
+                raise APIError(0, 'I need one parameter!')
             ackdata, = params
             if len(ackdata) != 64:
-                return 'API Error 0015: The length of ackData should be 32 bytes (encoded in hex thus 64 characters).'
+                raise APIError(15, 'The length of ackData should be 32 bytes (encoded in hex thus 64 characters).')
+            ackdata = self._decode(ackdata, "hex")
             shared.sqlLock.acquire()
             shared.sqlSubmitQueue.put(
                 '''SELECT status FROM sent where ackdata=?''')
-            shared.sqlSubmitQueue.put((ackdata.decode('hex'),))
+            shared.sqlSubmitQueue.put((ackdata,))
             queryreturn = shared.sqlReturnQueue.get()
             shared.sqlLock.release()
             if queryreturn == []:
@@ -652,37 +669,36 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
                 return status
         elif method == 'addSubscription':
             if len(params) == 0:
-                return 'API Error 0000: I need parameters!'
+                raise APIError(0, 'I need parameters!')
             if len(params) == 1:
                 address, = params
                 label == ''
             if len(params) == 2:
                 address, label = params
-                label = label.decode('base64')
+                label = self._decode(label, "base64")
                 try:
                     unicode(label, 'utf-8')
                 except:
-                    return 'API Error 0017: Label is not valid UTF-8 data.'
+                    raise APIError(17, 'Label is not valid UTF-8 data.')
             if len(params) > 2:
-                return 'API Error 0000: I need either 1 or 2 parameters!'
+                raise APIError(0, 'I need either 1 or 2 parameters!')
             address = addBMIfNotPresent(address)
             status, addressVersionNumber, streamNumber, toRipe = decodeAddress(
                 address)
             if status != 'success':
-                with shared.printLock:
+                logger.warn('API Error 0007: Could not decode address %s. Status: %s.', address, status)
-                    print 'API Error 0007: Could not decode address:', address, ':', status
 
                 if status == 'checksumfailed':
-                    return 'API Error 0008: Checksum failed for address: ' + address
+                    raise APIError(8, 'Checksum failed for address: ' + address)
                 if status == 'invalidcharacters':
-                    return 'API Error 0009: Invalid characters in address: ' + address
+                    raise APIError(9, 'Invalid characters in address: ' + address)
                 if status == 'versiontoohigh':
-                    return 'API Error 0010: Address version number too high (or zero) in address: ' + address
+                    raise APIError(10, 'Address version number too high (or zero) in address: ' + address)
-                return 'API Error 0007: Could not decode address: ' + address + ' : ' + status
+                raise APIError(7, 'Could not decode address: ' + address + ' : ' + status)
             if addressVersionNumber < 2 or addressVersionNumber > 3:
-                return 'API Error 0011: The address version number currently must be 2 or 3. Others aren\'t supported.'
+                raise APIError(11, 'The address version number currently must be 2 or 3. Others aren\'t supported.')
             if streamNumber != 1:
-                return 'API Error 0012: The stream number must be 1. Others aren\'t supported.'
+                raise APIError(12, 'The stream number must be 1. Others aren\'t supported.')
             # First we must check to see if the address is already in the
             # subscriptions list.
             shared.sqlLock.acquire()
@@ -693,7 +709,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             queryreturn = shared.sqlReturnQueue.get()
             shared.sqlLock.release()
             if queryreturn != []:
-                return 'API Error 0016: You are already subscribed to that address.'
+                raise APIError(16, 'You are already subscribed to that address.')
             t = (label, address, True)
             shared.sqlLock.acquire()
             shared.sqlSubmitQueue.put(
@@ -709,7 +725,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
 
         elif method == 'deleteSubscription':
             if len(params) != 1:
-                return 'API Error 0000: I need 1 parameter!'
+                raise APIError(0, 'I need 1 parameter!')
             address, = params
             address = addBMIfNotPresent(address)
             t = (address,)
@@ -746,9 +762,9 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             # object and sends it out to the rest of the Bitmessage network as if it had generated the
             # message itself. Please do not yet add this to the api doc.
             if len(params) != 1:
-                return 'API Error 0000: I need 1 parameter!'
+                raise APIError(0, 'I need 1 parameter!')
             encryptedPayload, = params
-            encryptedPayload = encryptedPayload.decode('hex')
+            encryptedPayload = self._decode(encryptedPayload, "hex")
             toStreamNumber = decodeVarint(encryptedPayload[16:26])[0]
             inventoryHash = calculateInventoryHash(encryptedPayload)
             objectType = 'msg'
@@ -765,9 +781,9 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             # rest of the Bitmessage network as if it had generated the pubkey object itself. Please
             # do not yet add this to the api doc.
             if len(params) != 1:
-                return 'API Error 0000: I need 1 parameter!'
+                raise APIError(0, 'I need 1 parameter!')
             payload, = params
-            payload = payload.decode('hex')
+            payload = self._decode(payload, "hex")
             pubkeyReadPosition = 8 # bypass the nonce
             if payload[pubkeyReadPosition:pubkeyReadPosition+4] == '\x00\x00\x00\x00': # if this pubkey uses 8 byte time
                 pubkeyReadPosition += 8
@@ -790,11 +806,11 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             # doc.
             
             if len(params) != 1:
-                return 'API Error 0000: I need 1 parameter!'
+                raise APIError(0, 'I need 1 parameter!')
             requestedHash, = params
             if len(requestedHash) != 40:
-                return 'API Error 0019: The length of hash should be 20 bytes (encoded in hex thus 40 characters).'
+                raise APIError(19, 'The length of hash should be 20 bytes (encoded in hex thus 40 characters).')
-            requestedHash = requestedHash.decode('hex')
+            requestedHash = self._decode(requestedHash, "hex")
             
             # This is not a particularly commonly used API function. Before we 
             # use it we'll need to fill out a field in our inventory database 
@@ -832,11 +848,11 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             # Method will eventually be used by a particular Android app to 
             # retrieve pubkeys. Please do not yet add this to the api docs.
             if len(params) != 1:
-                return 'API Error 0000: I need 1 parameter!'
+                raise APIError(0, 'I need 1 parameter!')
             requestedHash, = params
             if len(requestedHash) != 40:
-                return 'API Error 0019: The length of hash should be 20 bytes (encoded in hex thus 40 characters).'
+                raise APIError(19, 'The length of hash should be 20 bytes (encoded in hex thus 40 characters).')
-            requestedHash = requestedHash.decode('hex')
+            requestedHash = self._decode(requestedHash, "hex")
             parameters = (requestedHash,)
             with shared.sqlLock:
                 shared.sqlSubmitQueue.put('''SELECT transmitdata FROM pubkeys WHERE hash = ? ; ''')
@@ -849,9 +865,31 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             data += ']}'
             return data
         elif method == 'clientStatus':
-            return '{ "networkConnections" : "%s" }' % str(len(shared.connectedHostsList))
+            if len(shared.connectedHostsList) == 0:
+                networkStatus = 'notConnected'
+            elif len(shared.connectedHostsList) > 0 and not shared.clientHasReceivedIncomingConnections:
+                networkStatus = 'connectedButHaveNotReceivedIncomingConnections'
+            else:
+                networkStatus = 'connectedAndReceivingIncomingConnections'
+            return json.dumps({'networkConnections':len(shared.connectedHostsList),'numberOfMessagesProcessed':shared.numberOfMessagesProcessed, 'numberOfBroadcastsProcessed':shared.numberOfBroadcastsProcessed, 'numberOfPubkeysProcessed':shared.numberOfPubkeysProcessed, 'networkStatus':networkStatus}, indent=4, separators=(',', ': '))
         else:
-            return 'API Error 0020: Invalid method: %s' % method
+            raise APIError(20, 'Invalid method: %s' % method)
+
+    def _dispatch(self, method, params):
+        self.cookies = []
+
+        validuser = self.APIAuthenticateClient()
+        if not validuser:
+            time.sleep(2)
+            return "RPC Username or password incorrect or HTTP header lacks authentication at all."
+
+        try:
+            return self._handle_request(method, params)
+        except APIError as e:
+            return str(e)
+        except Exception as e:
+            logger.exception(e)
+            return "API Error 0021: Unexpected API Failure - %s" % str(e)
 
 # This thread, of which there is only one, runs the API.
 
@@ -878,7 +916,7 @@ if shared.useVeryEasyProofOfWorkForTesting:
         shared.networkDefaultPayloadLengthExtraBytes / 7000)
 
 class Main:
-    def start(self, deamon=False):
+    def start(self, daemon=False):
         # is the application already running?  If yes then exit.
         thisapp = singleton.singleinstance()
 
@@ -931,7 +969,7 @@ class Main:
         singleListenerThread.daemon = True  # close the main program even if there are threads left
         singleListenerThread.start()
 
-        if deamon == False and shared.safeConfigGetBoolean('bitmessagesettings', 'daemon') == False:
+        if daemon == False and shared.safeConfigGetBoolean('bitmessagesettings', 'daemon') == False:
             try:
                 from PyQt4 import QtCore, QtGui
             except Exception as err:
@@ -944,7 +982,7 @@ class Main:
         else:
             shared.config.remove_option('bitmessagesettings', 'dontconnect')
 
-            if deamon:
+            if daemon:
                 with shared.printLock:
                     print 'Running as a daemon. The main program should exit this thread.'
             else:
@@ -962,7 +1000,6 @@ class Main:
     def getApiAddress(self):
         if not shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
             return None
-            
         address = shared.config.get('bitmessagesettings', 'apiinterface')
         port = shared.config.getint('bitmessagesettings', 'apiport')
         return {'address':address,'port':port}

src/bitmessageqt/__init__.py

@@ -417,11 +417,11 @@ class MyForm(QtGui.QMainWindow):
         QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
             "updateNetworkStatusTab()"), self.updateNetworkStatusTab)
         QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
-            "incrementNumberOfMessagesProcessed()"), self.incrementNumberOfMessagesProcessed)
+            "updateNumberOfMessagesProcessed()"), self.updateNumberOfMessagesProcessed)
         QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
-            "incrementNumberOfPubkeysProcessed()"), self.incrementNumberOfPubkeysProcessed)
+            "updateNumberOfPubkeysProcessed()"), self.updateNumberOfPubkeysProcessed)
         QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
-            "incrementNumberOfBroadcastsProcessed()"), self.incrementNumberOfBroadcastsProcessed)
+            "updateNumberOfBroadcastsProcessed()"), self.updateNumberOfBroadcastsProcessed)
         QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
             "setStatusIcon(PyQt_PyObject)"), self.setStatusIcon)
         QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL(
@@ -1072,12 +1072,22 @@ class MyForm(QtGui.QMainWindow):
                 if 'linux' in sys.platform:
                     # Note: QSound was a nice idea but it didn't work
                     if '.mp3' in soundFilename:
+                        gst_available=False
                         try:
                             subprocess.call(["gst123", soundFilename],
                                             stdin=subprocess.PIPE, 
                                             stdout=subprocess.PIPE)
+                            gst_available=True
                         except:
                             print "WARNING: gst123 must be installed in order to play mp3 sounds"
+                        if not gst_available:
+                            try:
+                                subprocess.call(["mpg123", soundFilename],
+                                                stdin=subprocess.PIPE, 
+                                                stdout=subprocess.PIPE)
+                                gst_available=True
+                            except:
+                                print "WARNING: mpg123 must be installed in order to play mp3 sounds"
                     else:
                         try:
                             subprocess.call(["aplay", soundFilename],
@@ -1260,20 +1270,17 @@ class MyForm(QtGui.QMainWindow):
             self.actionShow.setChecked(not self.actionShow.isChecked())
             self.appIndicatorShowOrHideWindow()
 
-    def incrementNumberOfMessagesProcessed(self):
+    def updateNumberOfMessagesProcessed(self):
-        self.numberOfMessagesProcessed += 1
         self.ui.labelMessageCount.setText(_translate(
-            "MainWindow", "Processed %1 person-to-person messages.").arg(str(self.numberOfMessagesProcessed)))
+            "MainWindow", "Processed %1 person-to-person messages.").arg(str(shared.numberOfMessagesProcessed)))
 
-    def incrementNumberOfBroadcastsProcessed(self):
+    def updateNumberOfBroadcastsProcessed(self):
-        self.numberOfBroadcastsProcessed += 1
         self.ui.labelBroadcastCount.setText(_translate(
-            "MainWindow", "Processed %1 broadcast messages.").arg(str(self.numberOfBroadcastsProcessed)))
+            "MainWindow", "Processed %1 broadcast messages.").arg(str(shared.numberOfBroadcastsProcessed)))
 
-    def incrementNumberOfPubkeysProcessed(self):
+    def updateNumberOfPubkeysProcessed(self):
-        self.numberOfPubkeysProcessed += 1
         self.ui.labelPubkeyCount.setText(_translate(
-            "MainWindow", "Processed %1 public keys.").arg(str(self.numberOfPubkeysProcessed)))
+            "MainWindow", "Processed %1 public keys.").arg(str(shared.numberOfPubkeysProcessed)))
 
     def updateNetworkStatusTab(self):
         # print 'updating network status tab'
@@ -2031,20 +2038,30 @@ class MyForm(QtGui.QMainWindow):
                 self.settingsDialogInstance.ui.checkBoxStartInTray.isChecked()))
             shared.config.set('bitmessagesettings', 'willinglysendtomobile', str(
                 self.settingsDialogInstance.ui.checkBoxWillinglySendToMobile.isChecked()))
+            
+            lang_ind = int(self.settingsDialogInstance.ui.languageComboBox.currentIndex())
+            if not languages[lang_ind] == 'other':
+                shared.config.set('bitmessagesettings', 'userlocale', languages[lang_ind])
+                
             if int(shared.config.get('bitmessagesettings', 'port')) != int(self.settingsDialogInstance.ui.lineEditTCPPort.text()):
                 if not shared.safeConfigGetBoolean('bitmessagesettings', 'dontconnect'):
                     QMessageBox.about(self, _translate("MainWindow", "Restart"), _translate(
                         "MainWindow", "You must restart Bitmessage for the port number change to take effect."))
                 shared.config.set('bitmessagesettings', 'port', str(
                     self.settingsDialogInstance.ui.lineEditTCPPort.text()))
-            if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText())[0:5] == 'SOCKS':
+            #print 'self.settingsDialogInstance.ui.comboBoxProxyType.currentText()', self.settingsDialogInstance.ui.comboBoxProxyType.currentText()
+            #print 'self.settingsDialogInstance.ui.comboBoxProxyType.currentText())[0:5]', self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5]
+            if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] == 'SOCKS':
                 if shared.statusIconColor != 'red':
                     QMessageBox.about(self, _translate("MainWindow", "Restart"), _translate(
                         "MainWindow", "Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any)."))
-            if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText()) == 'none':
+            if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] != 'SOCKS':
                 self.statusBar().showMessage('')
-            shared.config.set('bitmessagesettings', 'socksproxytype', str(
+            if self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] == 'SOCKS':
-                self.settingsDialogInstance.ui.comboBoxProxyType.currentText()))
+                shared.config.set('bitmessagesettings', 'socksproxytype', str(
+                    self.settingsDialogInstance.ui.comboBoxProxyType.currentText()))
+            else:
+                shared.config.set('bitmessagesettings', 'socksproxytype', 'none')
             shared.config.set('bitmessagesettings', 'socksauthentication', str(
                 self.settingsDialogInstance.ui.checkBoxAuthentication.isChecked()))
             shared.config.set('bitmessagesettings', 'sockshostname', str(
@@ -3041,6 +3058,16 @@ class settingsDialog(QtGui.QDialog):
             shared.config.getboolean('bitmessagesettings', 'startintray'))
         self.ui.checkBoxWillinglySendToMobile.setChecked(
             shared.safeConfigGetBoolean('bitmessagesettings', 'willinglysendtomobile'))
+        
+        global languages 
+        languages = ['system','en','eo','fr','de','es','ru','en_pirate','other']
+        user_countrycode = str(shared.config.get('bitmessagesettings', 'userlocale'))
+        if user_countrycode in languages:
+            curr_index = languages.index(user_countrycode)
+        else:
+            curr_index = languages.index('other')
+        self.ui.languageComboBox.setCurrentIndex(curr_index)
+        
         if shared.appdata == '':
             self.ui.checkBoxPortableMode.setChecked(True)
         if 'darwin' in sys.platform:
@@ -3326,103 +3353,105 @@ class myTableWidgetItem(QTableWidgetItem):
     def __lt__(self, other):
         return int(self.data(33).toPyObject()) < int(other.data(33).toPyObject())
 
-from threading import Thread
+class UISignaler(QThread):
-class UISignaler(Thread,QThread):
 
     def __init__(self, parent=None):
-        Thread.__init__(self, parent)
         QThread.__init__(self, parent)
 
     def run(self):
         while True:
-            try:
+            command, data = shared.UISignalQueue.get()
-                command, data = shared.UISignalQueue.get()
+            if command == 'writeNewAddressToTable':
-                if command == 'writeNewAddressToTable':
+                label, address, streamNumber = data
-                    label, address, streamNumber = data
+                self.emit(SIGNAL(
-                    self.emit(SIGNAL(
+                    "writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), label, address, str(streamNumber))
-                        "writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), label, address, str(streamNumber))
+            elif command == 'updateStatusBar':
-                elif command == 'updateStatusBar':
+                self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"), data)
-                    self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"), data)
+            elif command == 'updateSentItemStatusByHash':
-                elif command == 'updateSentItemStatusByHash':
+                hash, message = data
-                    hash, message = data
+                self.emit(SIGNAL(
-                    self.emit(SIGNAL(
+                    "updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), hash, message)
-                        "updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), hash, message)
+            elif command == 'updateSentItemStatusByAckdata':
-                elif command == 'updateSentItemStatusByAckdata':
+                ackData, message = data
-                    ackData, message = data
+                self.emit(SIGNAL(
-                    self.emit(SIGNAL(
+                    "updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), ackData, message)
-                        "updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), ackData, message)
+            elif command == 'displayNewInboxMessage':
-                elif command == 'displayNewInboxMessage':
+                inventoryHash, toAddress, fromAddress, subject, body = data
-                    inventoryHash, toAddress, fromAddress, subject, body = data
+                self.emit(SIGNAL(
-                    self.emit(SIGNAL(
+                    "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
-                        "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
+                    inventoryHash, toAddress, fromAddress, subject, body)
-                        inventoryHash, toAddress, fromAddress, subject, body)
+            elif command == 'displayNewSentMessage':
-                elif command == 'displayNewSentMessage':
+                toAddress, fromLabel, fromAddress, subject, message, ackdata = data
-                    toAddress, fromLabel, fromAddress, subject, message, ackdata = data
+                self.emit(SIGNAL(
-                    self.emit(SIGNAL(
+                    "displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
-                        "displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
+                    toAddress, fromLabel, fromAddress, subject, message, ackdata)
-                        toAddress, fromLabel, fromAddress, subject, message, ackdata)
+            elif command == 'updateNetworkStatusTab':
-                elif command == 'updateNetworkStatusTab':
+                self.emit(SIGNAL("updateNetworkStatusTab()"))
-                    self.emit(SIGNAL("updateNetworkStatusTab()"))
+            elif command == 'updateNumberOfMessagesProcessed':
-                elif command == 'incrementNumberOfMessagesProcessed':
+                self.emit(SIGNAL("updateNumberOfMessagesProcessed()"))
-                    self.emit(SIGNAL("incrementNumberOfMessagesProcessed()"))
+            elif command == 'updateNumberOfPubkeysProcessed':
-                elif command == 'incrementNumberOfPubkeysProcessed':
+                self.emit(SIGNAL("updateNumberOfPubkeysProcessed()"))
-                    self.emit(SIGNAL("incrementNumberOfPubkeysProcessed()"))
+            elif command == 'updateNumberOfBroadcastsProcessed':
-                elif command == 'incrementNumberOfBroadcastsProcessed':
+                self.emit(SIGNAL("updateNumberOfBroadcastsProcessed()"))
-                    self.emit(SIGNAL("incrementNumberOfBroadcastsProcessed()"))
+            elif command == 'setStatusIcon':
-                elif command == 'setStatusIcon':
+                self.emit(SIGNAL("setStatusIcon(PyQt_PyObject)"), data)
-                    self.emit(SIGNAL("setStatusIcon(PyQt_PyObject)"), data)
+            elif command == 'rerenderInboxFromLabels':
-                elif command == 'rerenderInboxFromLabels':
+                self.emit(SIGNAL("rerenderInboxFromLabels()"))
-                    self.emit(SIGNAL("rerenderInboxFromLabels()"))
+            elif command == 'rerenderSubscriptions':
-                elif command == 'rerenderSubscriptions':
+                self.emit(SIGNAL("rerenderSubscriptions()"))
-                    self.emit(SIGNAL("rerenderSubscriptions()"))
+            elif command == 'removeInboxRowByMsgid':
-                elif command == 'removeInboxRowByMsgid':
+                self.emit(SIGNAL("removeInboxRowByMsgid(PyQt_PyObject)"), data)
-                    self.emit(SIGNAL("removeInboxRowByMsgid(PyQt_PyObject)"), data)
+            else:
-                else:
+                sys.stderr.write(
-                    sys.stderr.write(
+                    'Command sent to UISignaler not recognized: %s\n' % command)
-                        'Command sent to UISignaler not recognized: %s\n' % command)
-            except Exception,ex:
-                # uncaught exception will block gevent
-                import traceback
-                traceback.print_exc()
-                traceback.print_stack()
-                print ex
-                pass
-
-try:
-    import gevent
-except ImportError as ex:
-    gevent = None
-else:
-    def mainloop(app):
-        while True:
-            app.processEvents()
-            gevent.sleep(0.01)
-    def testprint():
-        #print 'this is running'
-        gevent.spawn_later(1, testprint)
 
 def run():
     app = QtGui.QApplication(sys.argv)
     translator = QtCore.QTranslator()
-
-    lang_countrycode = str(locale.getdefaultlocale()[0])
-    translation = "translations/bitmessage_" + lang_countrycode
     
-    if not os.path.isfile(translation + ".pro"):
-        # Don't have fully localized translation, try language only
-        lang = lang_countrycode[0:2] 
-        translation = "translations/bitmessage_" + lang
-
-    if not os.path.isfile(translation + ".pro"):
-        # Don't have language either, default to 'Merica USA! USA!
-        translation = "translations/bitmessage_en_US"
-        
     try:
-        translator.load(translation)
+        locale_countrycode = str(locale.getdefaultlocale()[0])
-        #translator.load("translations/bitmessage_fr_BE") # test French
     except:
         # The above is not compatible with all versions of OSX.
-        translator.load("translations/bitmessage_en_US") # Default to english.
+        locale_countrycode = "en_US" # Default to english.
+    locale_lang = locale_countrycode[0:2]
+    user_countrycode = str(shared.config.get('bitmessagesettings', 'userlocale'))
+    user_lang = user_countrycode[0:2]
+    translation_path = "translations/bitmessage_"
+    
+    if shared.config.get('bitmessagesettings', 'userlocale') == 'system':
+        # try to detect the users locale otherwise fallback to English
+        try:
+            # try the users full locale, e.g. 'en_US':
+            # since we usually only provide languages, not localozations
+            # this will usually fail
+            translator.load(translation_path + locale_countrycode)
+        except:
+            try:
+                # try the users locale language, e.g. 'en':
+                # since we usually only provide languages, not localozations
+                # this will usually succeed
+                translator.load(translation_path + locale_lang)
+            except:
+                # as English is already the default language, we don't
+                # need to do anything. No need to translate.
+                pass
+    else:
+        try:
+            # check if the user input is a valid translation file:
+            # since user_countrycode will be usually set by the combobox
+            # it will usually just be a language code
+            translator.load(translation_path + user_countrycode)
+        except:
+            try:
+                # check if the user lang is a valid translation file:
+                # this is only needed if the user manually set his 'userlocale'
+                # in the keys.dat to a countrycode (e.g. 'de_CH')
+                translator.load(translation_path + user_lang)
+            except:
+                # as English is already the default language, we don't
+                # need to do anything. No need to translate.
+                pass
 
     QtGui.QApplication.installTranslator(translator)
     app.setStyleSheet("QStatusBar::item { border: 0px solid black }")
@@ -3436,8 +3465,4 @@ def run():
     myapp.notifierInit()
     if shared.safeConfigGetBoolean('bitmessagesettings', 'dontconnect'):
         myapp.showConnectDialog() # ask the user if we may connect
-    if gevent is None:
+    sys.exit(app.exec_())
-        sys.exit(app.exec_())
-    else:
-        gevent.joinall([gevent.spawn(testprint), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app)])
-        print 'done'

src/bitmessageqt/bitmessageui.py

@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'bitmessageui.ui'
 #
-# Created: Mon Aug 12 00:08:20 2013
+# Created: Thu Aug 15 14:19:52 2013
-#      by: PyQt4 UI code generator 4.10.2
+#      by: PyQt4 UI code generator 4.10
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -69,7 +69,11 @@ class Ui_MainWindow(object):
         self.inboxSearchOptionCB.addItem(_fromUtf8(""))
         self.horizontalLayoutSearch.addWidget(self.inboxSearchOptionCB)
         self.verticalLayout_2.addLayout(self.horizontalLayoutSearch)
-        self.tableWidgetInbox = QtGui.QTableWidget(self.inbox)
+        self.splitter = QtGui.QSplitter(self.inbox)
+        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.splitter.setObjectName(_fromUtf8("splitter"))
+        self.tableWidgetInbox = QtGui.QTableWidget(self.splitter)
+        self.tableWidgetInbox.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
         self.tableWidgetInbox.setAlternatingRowColors(True)
         self.tableWidgetInbox.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
         self.tableWidgetInbox.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
@@ -93,11 +97,11 @@ class Ui_MainWindow(object):
         self.tableWidgetInbox.horizontalHeader().setStretchLastSection(True)
         self.tableWidgetInbox.verticalHeader().setVisible(False)
         self.tableWidgetInbox.verticalHeader().setDefaultSectionSize(26)
-        self.verticalLayout_2.addWidget(self.tableWidgetInbox)
+        self.textEditInboxMessage = QtGui.QTextEdit(self.splitter)
-        self.textEditInboxMessage = QtGui.QTextEdit(self.inbox)
         self.textEditInboxMessage.setBaseSize(QtCore.QSize(0, 500))
+        self.textEditInboxMessage.setReadOnly(True)
         self.textEditInboxMessage.setObjectName(_fromUtf8("textEditInboxMessage"))
-        self.verticalLayout_2.addWidget(self.textEditInboxMessage)
+        self.verticalLayout_2.addWidget(self.splitter)
         icon1 = QtGui.QIcon()
         icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/inbox.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.tabWidget.addTab(self.inbox, icon1, _fromUtf8(""))
@@ -193,7 +197,11 @@ class Ui_MainWindow(object):
         self.sentSearchOptionCB.addItem(_fromUtf8(""))
         self.horizontalLayout.addWidget(self.sentSearchOptionCB)
         self.verticalLayout.addLayout(self.horizontalLayout)
-        self.tableWidgetSent = QtGui.QTableWidget(self.sent)
+        self.splitter_2 = QtGui.QSplitter(self.sent)
+        self.splitter_2.setOrientation(QtCore.Qt.Vertical)
+        self.splitter_2.setObjectName(_fromUtf8("splitter_2"))
+        self.tableWidgetSent = QtGui.QTableWidget(self.splitter_2)
+        self.tableWidgetSent.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
         self.tableWidgetSent.setDragDropMode(QtGui.QAbstractItemView.DragDrop)
         self.tableWidgetSent.setAlternatingRowColors(True)
         self.tableWidgetSent.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
@@ -217,10 +225,10 @@ class Ui_MainWindow(object):
         self.tableWidgetSent.horizontalHeader().setStretchLastSection(True)
         self.tableWidgetSent.verticalHeader().setVisible(False)
         self.tableWidgetSent.verticalHeader().setStretchLastSection(False)
-        self.verticalLayout.addWidget(self.tableWidgetSent)
+        self.textEditSentMessage = QtGui.QTextEdit(self.splitter_2)
-        self.textEditSentMessage = QtGui.QTextEdit(self.sent)
+        self.textEditSentMessage.setReadOnly(True)
         self.textEditSentMessage.setObjectName(_fromUtf8("textEditSentMessage"))
-        self.verticalLayout.addWidget(self.textEditSentMessage)
+        self.verticalLayout.addWidget(self.splitter_2)
         icon3 = QtGui.QIcon()
         icon3.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/sent.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.tabWidget.addTab(self.sent, icon3, _fromUtf8(""))
@@ -428,7 +436,7 @@ class Ui_MainWindow(object):
         self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtGui.QMenuBar(MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 795, 18))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 795, 23))
         self.menubar.setObjectName(_fromUtf8("menubar"))
         self.menuFile = QtGui.QMenu(self.menubar)
         self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -546,8 +554,8 @@ class Ui_MainWindow(object):
         self.textEditMessage.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"</style></head><body style=\" font-family:\'Sans\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p></body></html>", None))
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'MS Shell Dlg 2\';\"><br /></p></body></html>", None))
         self.label.setText(_translate("MainWindow", "To:", None))
         self.label_2.setText(_translate("MainWindow", "From:", None))
         self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None))

src/bitmessageqt/bitmessageui.ui

@@ -22,7 +22,16 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
-    <property name="margin">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
      <number>0</number>
     </property>
     <item row="0" column="0">
@@ -112,76 +121,85 @@
          </layout>
         </item>
         <item>
-         <widget class="QTableWidget" name="tableWidgetInbox">
+         <widget class="QSplitter" name="splitter">
-          <property name="alternatingRowColors">
+          <property name="orientation">
-           <bool>true</bool>
+           <enum>Qt::Vertical</enum>
           </property>
-          <property name="selectionMode">
+          <widget class="QTableWidget" name="tableWidgetInbox">
-           <enum>QAbstractItemView::ExtendedSelection</enum>
+           <property name="editTriggers">
-          </property>
+            <set>QAbstractItemView::NoEditTriggers</set>
-          <property name="selectionBehavior">
-           <enum>QAbstractItemView::SelectRows</enum>
-          </property>
-          <property name="sortingEnabled">
-           <bool>true</bool>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-          <attribute name="horizontalHeaderCascadingSectionResizes">
-           <bool>true</bool>
-          </attribute>
-          <attribute name="horizontalHeaderDefaultSectionSize">
-           <number>200</number>
-          </attribute>
-          <attribute name="horizontalHeaderHighlightSections">
-           <bool>false</bool>
-          </attribute>
-          <attribute name="horizontalHeaderMinimumSectionSize">
-           <number>27</number>
-          </attribute>
-          <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
-           <bool>false</bool>
-          </attribute>
-          <attribute name="horizontalHeaderStretchLastSection">
-           <bool>true</bool>
-          </attribute>
-          <attribute name="verticalHeaderVisible">
-           <bool>false</bool>
-          </attribute>
-          <attribute name="verticalHeaderDefaultSectionSize">
-           <number>26</number>
-          </attribute>
-          <column>
-           <property name="text">
-            <string>To</string>
            </property>
-          </column>
+           <property name="alternatingRowColors">
-          <column>
+            <bool>true</bool>
-           <property name="text">
-            <string>From</string>
            </property>
-          </column>
+           <property name="selectionMode">
-          <column>
+            <enum>QAbstractItemView::ExtendedSelection</enum>
-           <property name="text">
-            <string>Subject</string>
            </property>
-          </column>
+           <property name="selectionBehavior">
-          <column>
+            <enum>QAbstractItemView::SelectRows</enum>
-           <property name="text">
-            <string>Received</string>
            </property>
-          </column>
+           <property name="sortingEnabled">
-         </widget>
+            <bool>true</bool>
-        </item>
+           </property>
-        <item>
+           <property name="wordWrap">
-         <widget class="QTextEdit" name="textEditInboxMessage">
+            <bool>false</bool>
-          <property name="baseSize">
+           </property>
-           <size>
+           <attribute name="horizontalHeaderCascadingSectionResizes">
-            <width>0</width>
+            <bool>true</bool>
-            <height>500</height>
+           </attribute>
-           </size>
+           <attribute name="horizontalHeaderDefaultSectionSize">
-          </property>
+            <number>200</number>
+           </attribute>
+           <attribute name="horizontalHeaderHighlightSections">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="horizontalHeaderMinimumSectionSize">
+            <number>27</number>
+           </attribute>
+           <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="horizontalHeaderStretchLastSection">
+            <bool>true</bool>
+           </attribute>
+           <attribute name="verticalHeaderVisible">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="verticalHeaderDefaultSectionSize">
+            <number>26</number>
+           </attribute>
+           <column>
+            <property name="text">
+             <string>To</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>From</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Subject</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Received</string>
+            </property>
+           </column>
+          </widget>
+          <widget class="QTextEdit" name="textEditInboxMessage">
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>500</height>
+            </size>
+           </property>
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+          </widget>
          </widget>
         </item>
        </layout>
@@ -269,8 +287,8 @@
            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
          </widget>
         </item>
@@ -409,71 +427,81 @@ p, li { white-space: pre-wrap; }
          </layout>
         </item>
         <item>
-         <widget class="QTableWidget" name="tableWidgetSent">
+         <widget class="QSplitter" name="splitter_2">
-          <property name="dragDropMode">
+          <property name="orientation">
-           <enum>QAbstractItemView::DragDrop</enum>
+           <enum>Qt::Vertical</enum>
           </property>
-          <property name="alternatingRowColors">
+          <widget class="QTableWidget" name="tableWidgetSent">
-           <bool>true</bool>
+           <property name="editTriggers">
-          </property>
+            <set>QAbstractItemView::NoEditTriggers</set>
-          <property name="selectionMode">
-           <enum>QAbstractItemView::ExtendedSelection</enum>
-          </property>
-          <property name="selectionBehavior">
-           <enum>QAbstractItemView::SelectRows</enum>
-          </property>
-          <property name="sortingEnabled">
-           <bool>true</bool>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-          <attribute name="horizontalHeaderCascadingSectionResizes">
-           <bool>true</bool>
-          </attribute>
-          <attribute name="horizontalHeaderDefaultSectionSize">
-           <number>130</number>
-          </attribute>
-          <attribute name="horizontalHeaderHighlightSections">
-           <bool>false</bool>
-          </attribute>
-          <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
-           <bool>false</bool>
-          </attribute>
-          <attribute name="horizontalHeaderStretchLastSection">
-           <bool>true</bool>
-          </attribute>
-          <attribute name="verticalHeaderVisible">
-           <bool>false</bool>
-          </attribute>
-          <attribute name="verticalHeaderStretchLastSection">
-           <bool>false</bool>
-          </attribute>
-          <column>
-           <property name="text">
-            <string>To</string>
            </property>
-          </column>
+           <property name="dragDropMode">
-          <column>
+            <enum>QAbstractItemView::DragDrop</enum>
-           <property name="text">
-            <string>From</string>
            </property>
-          </column>
+           <property name="alternatingRowColors">
-          <column>
+            <bool>true</bool>
-           <property name="text">
-            <string>Subject</string>
            </property>
-          </column>
+           <property name="selectionMode">
-          <column>
+            <enum>QAbstractItemView::ExtendedSelection</enum>
-           <property name="text">
-            <string>Status</string>
            </property>
-          </column>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
+           <property name="sortingEnabled">
+            <bool>true</bool>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+           <attribute name="horizontalHeaderCascadingSectionResizes">
+            <bool>true</bool>
+           </attribute>
+           <attribute name="horizontalHeaderDefaultSectionSize">
+            <number>130</number>
+           </attribute>
+           <attribute name="horizontalHeaderHighlightSections">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="horizontalHeaderStretchLastSection">
+            <bool>true</bool>
+           </attribute>
+           <attribute name="verticalHeaderVisible">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="verticalHeaderStretchLastSection">
+            <bool>false</bool>
+           </attribute>
+           <column>
+            <property name="text">
+             <string>To</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>From</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Subject</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Status</string>
+            </property>
+           </column>
+          </widget>
+          <widget class="QTextEdit" name="textEditSentMessage">
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+          </widget>
          </widget>
         </item>
-        <item>
-         <widget class="QTextEdit" name="textEditSentMessage"/>
-        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="youridentities">
@@ -1023,7 +1051,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>795</width>
-     <height>18</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

src/bitmessageqt/settings.py

@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'settings.ui'
 #
-# Created: Wed Aug 14 18:31:34 2013
+# Created: Tue Aug 27 22:23:38 2013
-#      by: PyQt4 UI code generator 4.10
+#      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -41,55 +41,68 @@ class Ui_settingsDialog(object):
         self.tabUserInterface.setObjectName(_fromUtf8("tabUserInterface"))
         self.gridLayout_5 = QtGui.QGridLayout(self.tabUserInterface)
         self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5"))
-        self.labelSettingsNote = QtGui.QLabel(self.tabUserInterface)
-        self.labelSettingsNote.setText(_fromUtf8(""))
-        self.labelSettingsNote.setWordWrap(True)
-        self.labelSettingsNote.setObjectName(_fromUtf8("labelSettingsNote"))
-        self.gridLayout_5.addWidget(self.labelSettingsNote, 7, 0, 1, 1)
-        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.gridLayout_5.addItem(spacerItem, 8, 0, 1, 1)
-        self.checkBoxStartInTray = QtGui.QCheckBox(self.tabUserInterface)
-        self.checkBoxStartInTray.setObjectName(_fromUtf8("checkBoxStartInTray"))
-        self.gridLayout_5.addWidget(self.checkBoxStartInTray, 1, 0, 1, 1)
-        self.checkBoxShowTrayNotifications = QtGui.QCheckBox(self.tabUserInterface)
-        self.checkBoxShowTrayNotifications.setObjectName(_fromUtf8("checkBoxShowTrayNotifications"))
-        self.gridLayout_5.addWidget(self.checkBoxShowTrayNotifications, 3, 0, 1, 1)
         self.checkBoxMinimizeToTray = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxMinimizeToTray.setChecked(True)
         self.checkBoxMinimizeToTray.setObjectName(_fromUtf8("checkBoxMinimizeToTray"))
         self.gridLayout_5.addWidget(self.checkBoxMinimizeToTray, 2, 0, 1, 1)
-        self.label_7 = QtGui.QLabel(self.tabUserInterface)
+        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.label_7.setWordWrap(True)
+        self.gridLayout_5.addItem(spacerItem, 10, 0, 1, 1)
-        self.label_7.setObjectName(_fromUtf8("label_7"))
-        self.gridLayout_5.addWidget(self.label_7, 5, 0, 1, 1)
         self.checkBoxStartOnLogon = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxStartOnLogon.setObjectName(_fromUtf8("checkBoxStartOnLogon"))
         self.gridLayout_5.addWidget(self.checkBoxStartOnLogon, 0, 0, 1, 1)
+        self.checkBoxShowTrayNotifications = QtGui.QCheckBox(self.tabUserInterface)
+        self.checkBoxShowTrayNotifications.setObjectName(_fromUtf8("checkBoxShowTrayNotifications"))
+        self.gridLayout_5.addWidget(self.checkBoxShowTrayNotifications, 3, 0, 1, 1)
         self.checkBoxPortableMode = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxPortableMode.setObjectName(_fromUtf8("checkBoxPortableMode"))
         self.gridLayout_5.addWidget(self.checkBoxPortableMode, 4, 0, 1, 1)
+        self.checkBoxStartInTray = QtGui.QCheckBox(self.tabUserInterface)
+        self.checkBoxStartInTray.setObjectName(_fromUtf8("checkBoxStartInTray"))
+        self.gridLayout_5.addWidget(self.checkBoxStartInTray, 1, 0, 1, 1)
+        self.PortableModeDescription = QtGui.QLabel(self.tabUserInterface)
+        self.PortableModeDescription.setWordWrap(True)
+        self.PortableModeDescription.setObjectName(_fromUtf8("PortableModeDescription"))
+        self.gridLayout_5.addWidget(self.PortableModeDescription, 5, 0, 1, 2)
         self.checkBoxWillinglySendToMobile = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxWillinglySendToMobile.setObjectName(_fromUtf8("checkBoxWillinglySendToMobile"))
-        self.gridLayout_5.addWidget(self.checkBoxWillinglySendToMobile, 6, 0, 1, 1)
+        self.gridLayout_5.addWidget(self.checkBoxWillinglySendToMobile, 6, 0, 1, 2)
+        self.groupBox = QtGui.QGroupBox(self.tabUserInterface)
+        self.groupBox.setObjectName(_fromUtf8("groupBox"))
+        self.horizontalLayout_2 = QtGui.QHBoxLayout(self.groupBox)
+        self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
+        self.languageComboBox = QtGui.QComboBox(self.groupBox)
+        self.languageComboBox.setMinimumSize(QtCore.QSize(100, 0))
+        self.languageComboBox.setObjectName(_fromUtf8("languageComboBox"))
+        self.languageComboBox.addItem(_fromUtf8(""))
+        self.languageComboBox.addItem(_fromUtf8(""))
+        self.languageComboBox.addItem(_fromUtf8(""))
+        self.languageComboBox.addItem(_fromUtf8(""))
+        self.languageComboBox.addItem(_fromUtf8(""))
+        self.languageComboBox.addItem(_fromUtf8(""))
+        self.languageComboBox.addItem(_fromUtf8(""))
+        self.languageComboBox.addItem(_fromUtf8(""))
+        self.languageComboBox.addItem(_fromUtf8(""))
+        self.horizontalLayout_2.addWidget(self.languageComboBox)
+        self.gridLayout_5.addWidget(self.groupBox, 10, 1, 1, 1)
         self.tabWidgetSettings.addTab(self.tabUserInterface, _fromUtf8(""))
         self.tabNetworkSettings = QtGui.QWidget()
         self.tabNetworkSettings.setObjectName(_fromUtf8("tabNetworkSettings"))
         self.gridLayout_4 = QtGui.QGridLayout(self.tabNetworkSettings)
         self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4"))
-        self.groupBox = QtGui.QGroupBox(self.tabNetworkSettings)
+        self.groupBox1 = QtGui.QGroupBox(self.tabNetworkSettings)
-        self.groupBox.setObjectName(_fromUtf8("groupBox"))
+        self.groupBox1.setObjectName(_fromUtf8("groupBox1"))
-        self.gridLayout_3 = QtGui.QGridLayout(self.groupBox)
+        self.gridLayout_3 = QtGui.QGridLayout(self.groupBox1)
         self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3"))
         spacerItem1 = QtGui.QSpacerItem(125, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.gridLayout_3.addItem(spacerItem1, 0, 0, 1, 1)
-        self.label = QtGui.QLabel(self.groupBox)
+        self.label = QtGui.QLabel(self.groupBox1)
         self.label.setObjectName(_fromUtf8("label"))
         self.gridLayout_3.addWidget(self.label, 0, 1, 1, 1)
-        self.lineEditTCPPort = QtGui.QLineEdit(self.groupBox)
+        self.lineEditTCPPort = QtGui.QLineEdit(self.groupBox1)
         self.lineEditTCPPort.setMaximumSize(QtCore.QSize(70, 16777215))
         self.lineEditTCPPort.setObjectName(_fromUtf8("lineEditTCPPort"))
         self.gridLayout_3.addWidget(self.lineEditTCPPort, 0, 2, 1, 1)
-        self.gridLayout_4.addWidget(self.groupBox, 0, 0, 1, 1)
+        self.gridLayout_4.addWidget(self.groupBox1, 0, 0, 1, 1)
         self.groupBox_2 = QtGui.QGroupBox(self.tabNetworkSettings)
         self.groupBox_2.setObjectName(_fromUtf8("groupBox_2"))
         self.gridLayout_2 = QtGui.QGridLayout(self.groupBox_2)
@@ -324,15 +337,25 @@ class Ui_settingsDialog(object):
 
     def retranslateUi(self, settingsDialog):
         settingsDialog.setWindowTitle(_translate("settingsDialog", "Settings", None))
-        self.checkBoxStartInTray.setText(_translate("settingsDialog", "Start Bitmessage in the tray (don\'t show main window)", None))
-        self.checkBoxShowTrayNotifications.setText(_translate("settingsDialog", "Show notification when message received", None))
         self.checkBoxMinimizeToTray.setText(_translate("settingsDialog", "Minimize to tray", None))
-        self.label_7.setText(_translate("settingsDialog", "In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.", None))
         self.checkBoxStartOnLogon.setText(_translate("settingsDialog", "Start Bitmessage on user login", None))
+        self.checkBoxShowTrayNotifications.setText(_translate("settingsDialog", "Show notification when message received", None))
         self.checkBoxPortableMode.setText(_translate("settingsDialog", "Run in Portable Mode", None))
+        self.checkBoxStartInTray.setText(_translate("settingsDialog", "Start Bitmessage in the tray (don\'t show main window)", None))
+        self.PortableModeDescription.setText(_translate("settingsDialog", "In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.", None))
         self.checkBoxWillinglySendToMobile.setText(_translate("settingsDialog", "Willingly include unencrypted destination address when sending to a mobile device", None))
+        self.groupBox.setTitle(_translate("settingsDialog", "Interface Language", None))
+        self.languageComboBox.setItemText(0, _translate("settingsDialog", "System Settings", "system"))
+        self.languageComboBox.setItemText(1, _translate("settingsDialog", "English", "en"))
+        self.languageComboBox.setItemText(2, _translate("settingsDialog", "Esperanto", "eo"))
+        self.languageComboBox.setItemText(3, _translate("settingsDialog", "Français", "fr"))
+        self.languageComboBox.setItemText(4, _translate("settingsDialog", "Deutsch", "de"))
+        self.languageComboBox.setItemText(5, _translate("settingsDialog", "Español", "es"))
+        self.languageComboBox.setItemText(6, _translate("settingsDialog", "Русский", "ru"))
+        self.languageComboBox.setItemText(7, _translate("settingsDialog", "Pirate English", "en_pirate"))
+        self.languageComboBox.setItemText(8, _translate("settingsDialog", "Other (set in keys.dat)", "other"))
         self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabUserInterface), _translate("settingsDialog", "User Interface", None))
-        self.groupBox.setTitle(_translate("settingsDialog", "Listening port", None))
+        self.groupBox1.setTitle(_translate("settingsDialog", "Listening port", None))
         self.label.setText(_translate("settingsDialog", "Listen for connections on port:", None))
         self.groupBox_2.setTitle(_translate("settingsDialog", "Proxy server / Tor", None))
         self.label_2.setText(_translate("settingsDialog", "Type:", None))

src/bitmessageqt/settings.ui

@@ -37,17 +37,17 @@
        <string>User Interface</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
-       <item row="7" column="0">
+       <item row="2" column="0">
-        <widget class="QLabel" name="labelSettingsNote">
+        <widget class="QCheckBox" name="checkBoxMinimizeToTray">
          <property name="text">
-          <string/>
+          <string>Minimize to tray</string>
          </property>
-         <property name="wordWrap">
+         <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="8" column="0">
+       <item row="10" column="0">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -60,10 +60,10 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="0">
+       <item row="0" column="0">
-        <widget class="QCheckBox" name="checkBoxStartInTray">
+        <widget class="QCheckBox" name="checkBoxStartOnLogon">
          <property name="text">
-          <string>Start Bitmessage in the tray (don't show main window)</string>
+          <string>Start Bitmessage on user login</string>
          </property>
         </widget>
        </item>
@@ -74,18 +74,22 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="4" column="0">
-        <widget class="QCheckBox" name="checkBoxMinimizeToTray">
+        <widget class="QCheckBox" name="checkBoxPortableMode">
          <property name="text">
-          <string>Minimize to tray</string>
+          <string>Run in Portable Mode</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="1" column="0">
-        <widget class="QLabel" name="label_7">
+        <widget class="QCheckBox" name="checkBoxStartInTray">
+         <property name="text">
+          <string>Start Bitmessage in the tray (don't show main window)</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="2">
+        <widget class="QLabel" name="PortableModeDescription">
          <property name="text">
           <string>In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.</string>
          </property>
@@ -94,27 +98,77 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
+       <item row="6" column="0" colspan="2">
-        <widget class="QCheckBox" name="checkBoxStartOnLogon">
-         <property name="text">
-          <string>Start Bitmessage on user login</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <widget class="QCheckBox" name="checkBoxPortableMode">
-         <property name="text">
-          <string>Run in Portable Mode</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
         <widget class="QCheckBox" name="checkBoxWillinglySendToMobile">
          <property name="text">
           <string>Willingly include unencrypted destination address when sending to a mobile device</string>
          </property>
         </widget>
        </item>
+       <item row="10" column="1">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Interface Language</string>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QComboBox" name="languageComboBox">
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <item>
+             <property name="text">
+              <string comment="system">System Settings</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string comment="en">English</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string comment="eo">Esperanto</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string comment="fr">Français</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string comment="de">Deutsch</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string comment="es">Español</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string comment="ru">Русский</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string comment="en_pirate">Pirate English</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string comment="other">Other (set in keys.dat)</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabNetworkSettings">

src/build_osx.py

@@ -5,12 +5,15 @@ version = "0.3.4"
 mainscript = ["bitmessagemain.py"]
 
 setup(
-     name = name,
+	name = name,
 	version = version,
 	app = mainscript,
 	setup_requires = ["py2app"],
-	options = dict(py2app=dict(
+	options = dict(
-		resources = ["images"],
+		py2app = dict(
-		iconfile = "images/bitmessage.icns"
+			resources = ["images"],
-    ))
+			includes = ['sip', 'PyQt4._qt'],
+			iconfile = "images/bitmessage.icns"
+		)
+	)
 )

src/class_bgWorker.py

@@ -1,38 +0,0 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-# cody by linker.lin@me.com
-
-__author__ = 'linkerlin'
-
-
-import threading
-import Queue
-import time
-
-class bgWorker(threading.Thread):
-    def __init__(self):
-        threading.Thread.__init__(self)
-        self.q = Queue.Queue()
-        self.setDaemon(True)
-
-    def post(self,job):
-        self.q.put(job)
-
-    def run(self):
-        while 1:
-            job=None
-            try:
-                job = self.q.get(block=True)
-                if job:
-                    job()
-            except Exception as ex:
-                print "Error,job exception:",ex.message,type(ex)
-                time.sleep(0.05)
-            else:
-                #print "job: ", job, " done"
-                pass
-            finally:
-                time.sleep(0.05)
-
-bgworker = bgWorker()
-bgworker.start()

src/class_outgoingSynSender.py

@@ -25,7 +25,7 @@ class outgoingSynSender(threading.Thread):
     def run(self):
         while shared.safeConfigGetBoolean('bitmessagesettings', 'dontconnect'):
             time.sleep(2)
-        while True:
+        while shared.safeConfigGetBoolean('bitmessagesettings', 'sendoutgoingconnections'):
             while len(self.selfInitiatedConnections[self.streamNumber]) >= 8:  # maximum number of outgoing connections = 8
                 time.sleep(10)
             if shared.shutdown:

src/class_receiveDataThread.py

@@ -256,6 +256,7 @@ class receiveDataThread(threading.Thread):
     def connectionFullyEstablished(self):
         self.connectionIsOrWasFullyEstablished = True
         if not self.initiatedConnection:
+            shared.clientHasReceivedIncomingConnections = True
             shared.UISignalQueue.put(('setStatusIcon', 'green'))
         self.sock.settimeout(
             600)  # We'll send out a pong every 5 minutes to make sure the connection stays alive if there has been no other traffic to send lately.
@@ -392,8 +393,9 @@ class receiveDataThread(threading.Thread):
             objectType, self.streamNumber, data, embeddedTime)
         shared.inventoryLock.release()
         self.broadcastinv(self.inventoryHash)
+        shared.numberOfBroadcastsProcessed += 1
         shared.UISignalQueue.put((
-            'incrementNumberOfBroadcastsProcessed', 'no data'))
+            'updateNumberOfBroadcastsProcessed', 'no data'))
 
         self.processbroadcast(
             readPosition, data)  # When this function returns, we will have either successfully processed this broadcast because we are interested in it, ignored it because we aren't interested in it, or found problem with the broadcast that warranted ignoring it.
@@ -760,8 +762,9 @@ class receiveDataThread(threading.Thread):
             objectType, self.streamNumber, data, embeddedTime)
         shared.inventoryLock.release()
         self.broadcastinv(self.inventoryHash)
+        shared.numberOfMessagesProcessed += 1
         shared.UISignalQueue.put((
-            'incrementNumberOfMessagesProcessed', 'no data'))
+            'updateNumberOfMessagesProcessed', 'no data'))
 
         self.processmsg(
             readPosition, data)  # When this function returns, we will have either successfully processed the message bound for us, ignored it because it isn't bound for us, or found problem with the message that warranted ignoring it.
@@ -1178,8 +1181,9 @@ class receiveDataThread(threading.Thread):
             objectType, self.streamNumber, data, embeddedTime)
         shared.inventoryLock.release()
         self.broadcastinv(inventoryHash)
+        shared.numberOfPubkeysProcessed += 1
         shared.UISignalQueue.put((
-            'incrementNumberOfPubkeysProcessed', 'no data'))
+            'updateNumberOfPubkeysProcessed', 'no data'))
 
         self.processpubkey(data)
 
@@ -1216,7 +1220,7 @@ class receiveDataThread(threading.Thread):
         if addressVersion == 0:
             print '(Within processpubkey) addressVersion of 0 doesn\'t make sense.'
             return
-        if addressVersion >= 4 or addressVersion == 1:
+        if addressVersion > 3 or addressVersion == 1:
             with shared.printLock:
                 print 'This version of Bitmessage cannot handle version', addressVersion, 'addresses.'
 

src/class_singleWorker.py

@@ -535,6 +535,8 @@ class singleWorker(threading.Thread):
             pubEncryptionKeyBase256 = pubkeyPayload[
                 readPosition:readPosition + 64]
             readPosition += 64
+            
+            # Let us fetch the amount of work required by the recipient.
             if toAddressVersionNumber == 2:
                 requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte
                 requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes
@@ -569,6 +571,7 @@ class singleWorker(threading.Thread):
                             requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes)).arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))))
                         continue
 
+
             embeddedTime = pack('>Q', (int(time.time()) + random.randrange(
                 -300, 300)))  # the current time plus or minus five minutes. We will use this time both for our message and for the ackdata packed within our message.
             if fromAddressVersionNumber == 2:

src/class_sqlThread.py

@@ -60,11 +60,10 @@ class sqlThread(threading.Thread):
             self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', (
                 int(time.time()),))
             self.conn.commit()
-            print 'Created messages database file'
+            logger.info('Created messages database file')
         except Exception as err:
             if str(err) == 'table inbox already exists':
-                with shared.printLock:
+                logger.debug('Database file already exists.')
-                    print 'Database file already exists.'
 
             else:
                 sys.stderr.write(
@@ -146,13 +145,13 @@ class sqlThread(threading.Thread):
         self.cur.execute(item, parameters)
         if self.cur.fetchall() == []:
             # The settings table doesn't exist. We need to make it.
-            print 'In messages.dat database, creating new \'settings\' table.'
+            logger.debug('In messages.dat database, creating new \'settings\' table.')
             self.cur.execute(
                 '''CREATE TABLE settings (key text, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' )
             self.cur.execute( '''INSERT INTO settings VALUES('version','1')''')
             self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', (
                 int(time.time()),))
-            print 'In messages.dat database, removing an obsolete field from the pubkeys table.'
+            logger.debug('In messages.dat database, removing an obsolete field from the pubkeys table.')
             self.cur.execute(
                 '''CREATE TEMPORARY TABLE pubkeys_backup(hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE);''')
             self.cur.execute(
@@ -163,17 +162,17 @@ class sqlThread(threading.Thread):
             self.cur.execute(
                 '''INSERT INTO pubkeys SELECT hash, transmitdata, time, usedpersonally FROM pubkeys_backup;''')
             self.cur.execute( '''DROP TABLE pubkeys_backup;''')
-            print 'Deleting all pubkeys from inventory. They will be redownloaded and then saved with the correct times.'
+            logger.debug('Deleting all pubkeys from inventory. They will be redownloaded and then saved with the correct times.')
             self.cur.execute(
                 '''delete from inventory where objecttype = 'pubkey';''')
-            print 'replacing Bitmessage announcements mailing list with a new one.'
+            logger.debug('replacing Bitmessage announcements mailing list with a new one.')
             self.cur.execute(
                 '''delete from subscriptions where address='BM-BbkPSZbzPwpVcYZpU4yHwf9ZPEapN5Zx' ''')
             self.cur.execute(
                 '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''')
-            print 'Commiting.'
+            logger.debug('Commiting.')
             self.conn.commit()
-            print 'Vacuuming message.dat. You might notice that the file size gets much smaller.'
+            logger.debug('Vacuuming message.dat. You might notice that the file size gets much smaller.')
             self.cur.execute( ''' VACUUM ''')
 
         # After code refactoring, the possible status values for sent messages
@@ -205,6 +204,14 @@ class sqlThread(threading.Thread):
             item = '''update settings set value=? WHERE key='version';'''
             parameters = (2,)
             self.cur.execute(item, parameters)
+
+        if not shared.config.has_option('bitmessagesettings', 'userlocale'):
+            shared.config.set('bitmessagesettings', 'userlocale', 'system')
+        if not shared.config.has_option('bitmessagesettings', 'sendoutgoingconnections'):
+            shared.config.set('bitmessagesettings', 'sendoutgoingconnections', 'True')
+
+        # Are you hoping to add a new option to the keys.dat file of existing
+        # Bitmessage users? Add it right above this line!
         
         try:
             testpayload = '\x00\x00'
@@ -219,11 +226,11 @@ class sqlThread(threading.Thread):
             self.cur.execute('''DELETE FROM pubkeys WHERE hash='1234' ''')
             self.conn.commit()
             if transmitdata == '':
-                sys.stderr.write('Problem: The version of SQLite you have cannot store Null values. Please download and install the latest revision of your version of Python (for example, the latest Python 2.7 revision) and try again.\n')
+                logger.fatal('Problem: The version of SQLite you have cannot store Null values. Please download and install the latest revision of your version of Python (for example, the latest Python 2.7 revision) and try again.\n')
-                sys.stderr.write('PyBitmessage will now exit very abruptly. You may now see threading errors related to this abrupt exit but the problem you need to solve is related to SQLite.\n\n')
+                logger.fatal('PyBitmessage will now exit very abruptly. You may now see threading errors related to this abrupt exit but the problem you need to solve is related to SQLite.\n\n')
                 os._exit(0)
         except Exception as err:
-            print err
+            logger.error(err)
 
         # Let us check to see the last time we vaccumed the messages.dat file.
         # If it has been more than a month let's do it now.
@@ -234,7 +241,7 @@ class sqlThread(threading.Thread):
         for row in queryreturn:
             value, = row
             if int(value) < int(time.time()) - 2592000:
-                print 'It has been a long time since the messages.dat file has been vacuumed. Vacuuming now...'
+                logger.info('It has been a long time since the messages.dat file has been vacuumed. Vacuuming now...')
                 self.cur.execute( ''' VACUUM ''')
                 item = '''update settings set value=? WHERE key='lastvacuumtime';'''
                 parameters = (int(time.time()),)
@@ -246,13 +253,11 @@ class sqlThread(threading.Thread):
                 self.conn.commit()
             elif item == 'exit':
                 self.conn.close()
-                with shared.printLock:
+                logger.info('sqlThread exiting gracefully.')
-                    print 'sqlThread exiting gracefully.'
 
                 return
             elif item == 'movemessagstoprog':
-                with shared.printLock:
+                logger.debug('the sqlThread is moving the messages.dat file to the local program directory.')
-                    print 'the sqlThread is moving the messages.dat file to the local program directory.'
 
                 self.conn.commit()
                 self.conn.close()
@@ -262,8 +267,7 @@ class sqlThread(threading.Thread):
                 self.conn.text_factory = str
                 self.cur = self.conn.cursor()
             elif item == 'movemessagstoappdata':
-                with shared.printLock:
+                logger.debug('the sqlThread is moving the messages.dat file to the Appdata folder.')
-                    print 'the sqlThread is moving the messages.dat file to the Appdata folder.'
 
                 self.conn.commit()
                 self.conn.close()
@@ -284,10 +288,8 @@ class sqlThread(threading.Thread):
                 try:
                     self.cur.execute(item, parameters)
                 except Exception as err:
-                    with shared.printLock:
+                    logger.fatal('Major error occurred when trying to execute a SQL statement within the sqlThread. Please tell Atheros about this error message or post it in the forum! Error occurred while trying to execute statement: "%s"  Here are the parameters; you might want to censor this data with asterisks (***) as it can contain private information: %s. Here is the actual error message thrown by the sqlThread: %s', str(item), str(repr(parameters)),  str(err))
-                        sys.stderr.write('\nMajor error occurred when trying to execute a SQL statement within the sqlThread. Please tell Atheros about this error message or post it in the forum! Error occurred while trying to execute statement: "' + str(
+                    logger.fatal('This program shall now abruptly exit!')
-                            item) + '"  Here are the parameters; you might want to censor this data with asterisks (***) as it can contain private information: ' + str(repr(parameters)) + '\nHere is the actual error message thrown by the sqlThread: ' + str(err) + '\n')
-                        sys.stderr.write('This program shall now abruptly exit!\n')
 
                     os._exit(0)
 

src/helper_startup.py

@@ -2,85 +2,107 @@ import shared
 import ConfigParser
 import sys
 import os
+import locale
 
 from namecoin import ensureNamecoinOptions
 
 storeConfigFilesInSameDirectoryAsProgramByDefault = False  # The user may de-select Portable Mode in the settings if they want the config files to stay in the application data folder.
 
 def loadConfig():
-    # First try to load the config file (the keys.dat file) from the program
+    if shared.appdata:
-    # directory
-    shared.config.read('keys.dat')
-    try:
-        shared.config.get('bitmessagesettings', 'settingsversion')
-        print 'Loading config files from same directory as program'
-        shared.appdata = ''
-    except:
-        # Could not load the keys.dat file in the program directory. Perhaps it
-        # is in the appdata directory.
-        shared.appdata = shared.lookupAppdataFolder()
-        shared.config = ConfigParser.SafeConfigParser()
         shared.config.read(shared.appdata + 'keys.dat')
+        #shared.appdata must have been specified as a startup option.
         try:
             shared.config.get('bitmessagesettings', 'settingsversion')
-            print 'Loading existing config files from', shared.appdata
+            print 'Loading config files from directory specified on startup: ' + shared.appdata
+            needToCreateKeysFile = False
         except:
-            # This appears to be the first time running the program; there is
+            needToCreateKeysFile = True
-            # no config file (or it cannot be accessed). Create config file.
-            shared.config.add_section('bitmessagesettings')
-            shared.config.set('bitmessagesettings', 'settingsversion', '6')
-            shared.config.set('bitmessagesettings', 'port', '8444')
-            shared.config.set(
-                'bitmessagesettings', 'timeformat', '%%a, %%d %%b %%Y  %%I:%%M %%p')
-            shared.config.set('bitmessagesettings', 'blackwhitelist', 'black')
-            shared.config.set('bitmessagesettings', 'startonlogon', 'false')
-            if 'linux' in sys.platform:
-                shared.config.set(
-                    'bitmessagesettings', 'minimizetotray', 'false')
-                                  # This isn't implimented yet and when True on
-                                  # Ubuntu causes Bitmessage to disappear while
-                                  # running when minimized.
-            else:
-                shared.config.set(
-                    'bitmessagesettings', 'minimizetotray', 'true')
-            shared.config.set(
-                'bitmessagesettings', 'showtraynotifications', 'true')
-            shared.config.set('bitmessagesettings', 'startintray', 'false')
-            shared.config.set('bitmessagesettings', 'socksproxytype', 'none')
-            shared.config.set(
-                'bitmessagesettings', 'sockshostname', 'localhost')
-            shared.config.set('bitmessagesettings', 'socksport', '9050')
-            shared.config.set(
-                'bitmessagesettings', 'socksauthentication', 'false')
-            shared.config.set(
-                'bitmessagesettings', 'sockslisten', 'false')
-            shared.config.set('bitmessagesettings', 'socksusername', '')
-            shared.config.set('bitmessagesettings', 'sockspassword', '')
-            shared.config.set('bitmessagesettings', 'keysencrypted', 'false')
-            shared.config.set(
-                'bitmessagesettings', 'messagesencrypted', 'false')
-            shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(
-                shared.networkDefaultProofOfWorkNonceTrialsPerByte))
-            shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(
-                shared.networkDefaultPayloadLengthExtraBytes))
-            shared.config.set('bitmessagesettings', 'minimizeonclose', 'false')
-            shared.config.set(
-                'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0')
-            shared.config.set(
-                'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0')
-            shared.config.set('bitmessagesettings', 'dontconnect', 'true')
-            ensureNamecoinOptions()
 
-            if storeConfigFilesInSameDirectoryAsProgramByDefault:
+    else:
-                # Just use the same directory as the program and forget about
+        shared.config.read('keys.dat')
-                # the appdata folder
+        try:
-                shared.appdata = ''
+            shared.config.get('bitmessagesettings', 'settingsversion')
-                print 'Creating new config files in same directory as program.'
+            print 'Loading config files from same directory as program.'
-            else:
+            needToCreateKeysFile = False
-                print 'Creating new config files in', shared.appdata
+            shared.appdata = ''
-                if not os.path.exists(shared.appdata):
+        except:
-                    os.makedirs(shared.appdata)
+            # Could not load the keys.dat file in the program directory. Perhaps it
-            if not sys.platform.startswith('win'):
+            # is in the appdata directory.
-                os.umask(0o077)
+            shared.appdata = shared.lookupAppdataFolder()
-            with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+            shared.config.read(shared.appdata + 'keys.dat')
-                shared.config.write(configfile)
+            try:
+                shared.config.get('bitmessagesettings', 'settingsversion')
+                print 'Loading existing config files from', shared.appdata
+                needToCreateKeysFile = False
+            except:
+                needToCreateKeysFile = True
+
+    if needToCreateKeysFile:
+        # This appears to be the first time running the program; there is
+        # no config file (or it cannot be accessed). Create config file.
+        shared.config.add_section('bitmessagesettings')
+        shared.config.set('bitmessagesettings', 'settingsversion', '6')
+        shared.config.set('bitmessagesettings', 'port', '8444')
+        shared.config.set(
+            'bitmessagesettings', 'timeformat', '%%a, %%d %%b %%Y  %%I:%%M %%p')
+        shared.config.set('bitmessagesettings', 'blackwhitelist', 'black')
+        shared.config.set('bitmessagesettings', 'startonlogon', 'false')
+        if 'linux' in sys.platform:
+            shared.config.set(
+                'bitmessagesettings', 'minimizetotray', 'false')
+                              # This isn't implimented yet and when True on
+                              # Ubuntu causes Bitmessage to disappear while
+                              # running when minimized.
+        else:
+            shared.config.set(
+                'bitmessagesettings', 'minimizetotray', 'true')
+        shared.config.set(
+            'bitmessagesettings', 'showtraynotifications', 'true')
+        shared.config.set('bitmessagesettings', 'startintray', 'false')
+        shared.config.set('bitmessagesettings', 'socksproxytype', 'none')
+        shared.config.set(
+            'bitmessagesettings', 'sockshostname', 'localhost')
+        shared.config.set('bitmessagesettings', 'socksport', '9050')
+        shared.config.set(
+            'bitmessagesettings', 'socksauthentication', 'false')
+        shared.config.set(
+            'bitmessagesettings', 'sockslisten', 'false')
+        shared.config.set('bitmessagesettings', 'socksusername', '')
+        shared.config.set('bitmessagesettings', 'sockspassword', '')
+        shared.config.set('bitmessagesettings', 'keysencrypted', 'false')
+        shared.config.set(
+            'bitmessagesettings', 'messagesencrypted', 'false')
+        shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(
+            shared.networkDefaultProofOfWorkNonceTrialsPerByte))
+        shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(
+            shared.networkDefaultPayloadLengthExtraBytes))
+        shared.config.set('bitmessagesettings', 'minimizeonclose', 'false')
+        shared.config.set(
+            'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0')
+        shared.config.set(
+            'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0')
+        shared.config.set('bitmessagesettings', 'dontconnect', 'true')
+        shared.config.set('bitmessagesettings', 'userlocale', 'system')
+
+        # Are you hoping to add a new option to the keys.dat file? You're in
+        # the right place for adding it to users who install the software for
+        # the first time. But you must also add it to the keys.dat file of
+        # existing users. To do that, search the class_sqlThread.py file for the
+        # text: "right above this line!"
+
+        ensureNamecoinOptions()
+
+        if storeConfigFilesInSameDirectoryAsProgramByDefault:
+            # Just use the same directory as the program and forget about
+            # the appdata folder
+            shared.appdata = ''
+            print 'Creating new config files in same directory as program.'
+        else:
+            print 'Creating new config files in', shared.appdata
+            if not os.path.exists(shared.appdata):
+                os.makedirs(shared.appdata)
+        if not sys.platform.startswith('win'):
+            os.umask(0o077)
+        with open(shared.appdata + 'keys.dat', 'wb') as configfile:
+            shared.config.write(configfile)

src/namecoin.py

@@ -270,7 +270,7 @@ def ensureNamecoinOptions ():
         nmc.close ()
 
     except Exception as exc:
-        print "Failure reading namecoin config file: %s" % str (exc)
+        print "Could not read the Namecoin config file probably because you don't have Namecoin installed. That's ok; we don't really need it. Detailed error message: %s" % str (exc)
 
     # If still nothing found, set empty at least.
     if (not hasUser):

src/proofofwork.py

@@ -24,7 +24,7 @@ def _set_idle():
 
 def _pool_worker(nonce, initialHash, target, pool_size):
     _set_idle()
-    trialValue = 99999999999999999999
+    trialValue = float('inf')
     while trialValue > target:
         nonce += pool_size
         trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8])
@@ -32,7 +32,7 @@ def _pool_worker(nonce, initialHash, target, pool_size):
 
 def _doSafePoW(target, initialHash):
     nonce = 0
-    trialValue = 99999999999999999999
+    trialValue = float('inf')
     while trialValue > target:
         nonce += 1
         trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8])

src/shared.py

@@ -20,6 +20,7 @@ import sys
 import stat
 import threading
 import time
+from os import path, environ
 
 # Project imports.
 from addresses import *
@@ -64,6 +65,10 @@ successfullyDecryptMessageTimings = [
 apiAddressGeneratorReturnQueue = Queue.Queue(
     )  # The address generator thread uses this queue to get information back to the API thread.
 ackdataForWhichImWatching = {}
+clientHasReceivedIncomingConnections = False #used by API command clientStatus
+numberOfMessagesProcessed = 0
+numberOfBroadcastsProcessed = 0
+numberOfPubkeysProcessed = 0
 
 #If changed, these values will cause particularly unexpected behavior: You won't be able to either send or receive messages because the proof of work you do (or demand) won't match that done or demanded by others. Don't change them!
 networkDefaultProofOfWorkNonceTrialsPerByte = 320 #The amount of work that should be performed (and demanded) per byte of the payload. Double this number to double the work.
@@ -126,7 +131,6 @@ def assembleVersionMessage(remoteHost, remotePort, myStreamNumber):
 
 def lookupAppdataFolder():
     APPNAME = "PyBitmessage"
-    from os import path, environ
     if sys.platform == 'darwin':
         if "HOME" in environ:
             dataFolder = path.join(os.environ["HOME"], "Library/Application Support/", APPNAME) + '/'
@@ -240,7 +244,7 @@ def reloadMyAddressHashes():
             if isEnabled:
                 hasEnabledKeys = True
                 status,addressVersionNumber,streamNumber,hash = decodeAddress(addressInKeysFile)
-                if addressVersionNumber == 2 or addressVersionNumber == 3:
+                if addressVersionNumber == 2 or addressVersionNumber == 3 or addressVersionNumber == 4:
                     # Returns a simple 32 bytes of information encoded in 64 Hex characters,
                     # or null if there was an error.
                     privEncryptionKey = decodeWalletImportFormat(
@@ -251,7 +255,7 @@ def reloadMyAddressHashes():
                         myAddressesByHash[hash] = addressInKeysFile
 
                 else:
-                    logger.error('Error in reloadMyAddressHashes: Can\'t handle address versions other than 2 or 3.\n')
+                    logger.error('Error in reloadMyAddressHashes: Can\'t handle address versions other than 2, 3, or 4.\n')
 
     if not keyfileSecure:
         fixSensitiveFilePermissions(appdata + 'keys.dat', hasEnabledKeys)

src/translations/bitmessage_de.pro

@@ -1,33 +1,33 @@
-SOURCES	= 		../addresses.py\
+SOURCES	= 	../addresses.py\
-			../bitmessagemain.py\
+			../bitmessagemain.py\
-			../class_addressGenerator.py\
+			../class_addressGenerator.py\
-			../class_outgoingSynSender.py\
+			../class_outgoingSynSender.py\
-			../class_receiveDataThread.py\	
+			../class_receiveDataThread.py\
-			../class_sendDataThread.py\
+			../class_sendDataThread.py\
-			../class_singleCleaner.py\
+			../class_singleCleaner.py\
-			../class_singleListener.py\
+			../class_singleListener.py\
-			../class_singleWorker.py\
+			../class_singleWorker.py\
-			../class_sqlThread.py\
+			../class_sqlThread.py\
-			../helper_bitcoin.py\
+			../helper_bitcoin.py\
-			../helper_bootstrap.py\
+			../helper_bootstrap.py\
-			../helper_generic.py\
+			../helper_generic.py\
-			../helper_inbox.py\
+			../helper_inbox.py\
-			../helper_sent.py\
+			../helper_sent.py\
-			../helper_startup.py\
+			../helper_startup.py\
-			../shared.py
+			../shared.py\
-			../bitmessageqt/__init__.py\
+			../bitmessageqt/__init__.py\
-			../bitmessageqt/about.py\
+			../bitmessageqt/about.py\
-			../bitmessageqt/bitmessageui.py\
+			../bitmessageqt/bitmessageui.py\
-			../bitmessageqt/connect.py\
+			../bitmessageqt/connect.py\
-			../bitmessageqt/help.py\
+			../bitmessageqt/help.py\
-			../bitmessageqt/iconglossary.py\
+			../bitmessageqt/iconglossary.py\
-			../bitmessageqt/newaddressdialog.py\
+			../bitmessageqt/newaddressdialog.py\
-			../bitmessageqt/newchandialog.py\
+			../bitmessageqt/newchandialog.py\
-			../bitmessageqt/newsubscriptiondialog.py\
+			../bitmessageqt/newsubscriptiondialog.py\
-			../bitmessageqt/regenerateaddresses.py\
+			../bitmessageqt/regenerateaddresses.py\
-			../bitmessageqt/settings.py\
+			../bitmessageqt/settings.py\
-			../bitmessageqt/specialaddressbehavior.py
+			../bitmessageqt/specialaddressbehavior.py
-
+
-
+			
-TRANSLATIONS	= bitmessage_de_DE.ts
+TRANSLATIONS	= bitmessage_de.ts
-CODECFORTR	= UTF-8
+CODECFORTR      = UTF-8

src/translations/bitmessage_de.ts

@@ -1,200 +1,201 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE" sourcelanguage="en">
+<TS version="2.0" language="de" sourcelanguage="en">
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="__init__.py" line="91"/>
+        <location filename="../bitmessageqt/__init__.py" line="91"/>
         <source>One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now?</source>
         <translation>Eine Ihrer Adressen, %1, ist eine alte Version 1 Adresse. Version 1 Adressen werden nicht mehr unterstützt. Soll sie jetzt gelöscht werden?</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="163"/>
+        <location filename="../bitmessageqt/__init__.py" line="163"/>
         <source>Reply</source>
+        <translatorcomment>.</translatorcomment>
         <translation>Antworten</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="165"/>
+        <location filename="../bitmessageqt/__init__.py" line="165"/>
         <source>Add sender to your Address Book</source>
-        <translation>Absender zum Adressbuch hinzufügen</translation>
+        <translation>Absender zum Adressbuch hinzufügen.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="269"/>
+        <location filename="../bitmessageqt/__init__.py" line="269"/>
         <source>Move to Trash</source>
         <translation>In den Papierkorb verschieben</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="169"/>
+        <location filename="../bitmessageqt/__init__.py" line="169"/>
         <source>View HTML code as formatted text</source>
         <translation>HTML als formatierten Text anzeigen</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="171"/>
+        <location filename="../bitmessageqt/__init__.py" line="171"/>
         <source>Save message as...</source>
         <translation>Nachricht speichern unter...</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="573"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="573"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="292"/>
+        <location filename="../bitmessageqt/__init__.py" line="292"/>
         <source>Enable</source>
         <translation>Aktivieren</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="294"/>
+        <location filename="../bitmessageqt/__init__.py" line="294"/>
         <source>Disable</source>
         <translation>Deaktivieren</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="290"/>
+        <location filename="../bitmessageqt/__init__.py" line="290"/>
         <source>Copy address to clipboard</source>
         <translation>Adresse in die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="200"/>
+        <location filename="../bitmessageqt/__init__.py" line="200"/>
         <source>Special address behavior...</source>
         <translation>Spezielles Verhalten der Adresse...</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="218"/>
+        <location filename="../bitmessageqt/__init__.py" line="218"/>
         <source>Send message to this address</source>
         <translation>Nachricht an diese Adresse senden</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="222"/>
+        <location filename="../bitmessageqt/__init__.py" line="222"/>
         <source>Subscribe to this address</source>
         <translation>Diese Adresse abonnieren</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="224"/>
+        <location filename="../bitmessageqt/__init__.py" line="224"/>
         <source>Add New Address</source>
         <translation>Neue Adresse hinzufügen</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="288"/>
+        <location filename="../bitmessageqt/__init__.py" line="288"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="271"/>
+        <location filename="../bitmessageqt/__init__.py" line="271"/>
         <source>Copy destination address to clipboard</source>
         <translation>Zieladresse in die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="273"/>
+        <location filename="../bitmessageqt/__init__.py" line="273"/>
         <source>Force send</source>
         <translation>Senden erzwingen</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="600"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="600"/>
         <source>Add new entry</source>
         <translation>Neuen Eintrag erstellen</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="632"/>
+        <location filename="../bitmessageqt/__init__.py" line="632"/>
         <source>Waiting on their encryption key. Will request it again soon.</source>
         <translation>Warte auf den Verschlüsselungscode. Wird bald erneut angefordert.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="635"/>
+        <location filename="../bitmessageqt/__init__.py" line="635"/>
         <source>Encryption key request queued.</source>
         <translation>Verschlüsselungscode Anforderung steht aus.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="638"/>
+        <location filename="../bitmessageqt/__init__.py" line="638"/>
         <source>Queued.</source>
         <translation>In Warteschlange.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="641"/>
+        <location filename="../bitmessageqt/__init__.py" line="641"/>
         <source>Message sent. Waiting on acknowledgement. Sent at %1</source>
         <translation>Nachricht gesendet. Warten auf Bestätigung. Gesendet %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="647"/>
+        <location filename="../bitmessageqt/__init__.py" line="647"/>
         <source>Need to do work to send message. Work is queued.</source>
         <translation>Es muss Arbeit verrichtet werden um die Nachricht zu versenden. Arbeit ist in Warteschlange.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="650"/>
+        <location filename="../bitmessageqt/__init__.py" line="650"/>
         <source>Acknowledgement of the message received %1</source>
         <translation>Bestätigung der Nachricht erhalten %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="653"/>
+        <location filename="../bitmessageqt/__init__.py" line="653"/>
         <source>Broadcast queued.</source>
         <translation>Rundruf in Warteschlange.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="656"/>
+        <location filename="../bitmessageqt/__init__.py" line="656"/>
         <source>Broadcast on %1</source>
         <translation>Rundruf um %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="659"/>
+        <location filename="../bitmessageqt/__init__.py" line="659"/>
         <source>Problem: The work demanded by the recipient is more difficult than you are willing to do. %1</source>
         <translation>Problem: Die vom Empfänger geforderte Arbeit ist schwerer als Sie bereit sind zu berechnen. %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="662"/>
+        <location filename="../bitmessageqt/__init__.py" line="662"/>
         <source>Problem: The recipient&apos;s encryption key is no good. Could not encrypt message. %1</source>
         <translation>Problem: Der Verschlüsselungscode des Empfängers ist nicht in Ordnung. Nachricht konnte nicht verschlüsselt werden. %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="665"/>
+        <location filename="../bitmessageqt/__init__.py" line="665"/>
         <source>Forced difficulty override. Send should start soon.</source>
         <translation>Schwierigkeitslimit überschrieben. Senden sollte bald beginnen.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="668"/>
+        <location filename="../bitmessageqt/__init__.py" line="668"/>
         <source>Unknown status: %1 %2</source>
         <translation>Unbekannter Status: %1 %2</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="398"/>
+        <location filename="../bitmessageqt/__init__.py" line="398"/>
         <source>Since startup on %1</source>
         <translation>Seit Start der Anwendung am %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1344"/>
+        <location filename="../bitmessageqt/__init__.py" line="1344"/>
         <source>Not Connected</source>
         <translation>Nicht verbunden</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="821"/>
+        <location filename="../bitmessageqt/__init__.py" line="821"/>
         <source>Show Bitmessage</source>
         <translation>Bitmessage anzeigen</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="556"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="556"/>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="836"/>
+        <location filename="../bitmessageqt/__init__.py" line="836"/>
         <source>Subscribe</source>
         <translation>Abonnieren</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="597"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="597"/>
         <source>Address Book</source>
         <translation>Adressbuch</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="622"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="622"/>
         <source>Quit</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1130"/>
+        <location filename="../bitmessageqt/__init__.py" line="1130"/>
         <source>You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file.</source>
         <translation>Sie können Ihre Schlüssel verwalten, indem Sie die keys.dat Datei bearbeiten, die im gleichen Ordner wie das Programm liegt. Es ist wichtig, dass Sie diese Datei sichern.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1134"/>
+        <location filename="../bitmessageqt/__init__.py" line="1134"/>
         <source>You may manage your keys by editing the keys.dat file stored in
  %1 
 It is important that you back up this file.</source>
@@ -203,17 +204,17 @@ It is important that you back up this file.</source>
 Es ist wichtig, dass Sie diese Datei sichern.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1141"/>
+        <location filename="../bitmessageqt/__init__.py" line="1141"/>
         <source>Open keys.dat?</source>
         <translation>Datei keys.dat öffnen?</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1138"/>
+        <location filename="../bitmessageqt/__init__.py" line="1138"/>
         <source>You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)</source>
         <translation>Sie können Ihre Schlüssel verwalten, indem Sie die keys.dat Datei bearbeiten, die im gleichen Ordner wie das Programm liegt. Es ist wichtig, dass Sie diese Datei sichern. Möchten Sie die Datei jetzt öffnen? (Stellen Sie sicher, dass Bitmessage geschlossen ist, bevor Sie etwas ändern.)</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1141"/>
+        <location filename="../bitmessageqt/__init__.py" line="1141"/>
         <source>You may manage your keys by editing the keys.dat file stored in
  %1 
 It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)</source>
@@ -223,192 +224,192 @@ Es ist wichtig, dass Sie diese Datei sichern. Möchten Sie die datei jetzt öffn
 (Stellen Sie sicher, dass Bitmessage geschlossen ist, bevor Sie etwas ändern.)</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1147"/>
+        <location filename="../bitmessageqt/__init__.py" line="1147"/>
         <source>Delete trash?</source>
         <translation>Papierkorb leeren?</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1147"/>
+        <location filename="../bitmessageqt/__init__.py" line="1147"/>
         <source>Are you sure you want to delete all trashed messages?</source>
         <translation>Sind Sie sicher, dass Sie alle Nachrichten im Papierkorb löschen möchten?</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1158"/>
+        <location filename="../bitmessageqt/__init__.py" line="1158"/>
         <source>bad passphrase</source>
         <translation>Falscher Passwort-Satz</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1158"/>
+        <location filename="../bitmessageqt/__init__.py" line="1158"/>
         <source>You must type your passphrase. If you don&apos;t have one then this is not the form for you.</source>
         <translation>Sie müssen Ihren Passwort-Satz eingeben. Wenn Sie keinen haben, ist dies das falsche Formular für Sie.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1265"/>
+        <location filename="../bitmessageqt/__init__.py" line="1265"/>
         <source>Processed %1 person-to-person messages.</source>
         <translation>%1 Person-zu-Person-Nachrichten bearbeitet.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1270"/>
+        <location filename="../bitmessageqt/__init__.py" line="1270"/>
         <source>Processed %1 broadcast messages.</source>
         <translation>%1 Rundruf-Nachrichten bearbeitet.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1275"/>
+        <location filename="../bitmessageqt/__init__.py" line="1275"/>
         <source>Processed %1 public keys.</source>
         <translation>%1 öffentliche Schlüssel bearbeitet.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1319"/>
+        <location filename="../bitmessageqt/__init__.py" line="1319"/>
         <source>Total Connections: %1</source>
         <translation>Verbindungen insgesamt: %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1338"/>
+        <location filename="../bitmessageqt/__init__.py" line="1338"/>
         <source>Connection lost</source>
         <translation>Verbindung verloren</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1379"/>
+        <location filename="../bitmessageqt/__init__.py" line="1379"/>
         <source>Connected</source>
         <translation>Verbunden</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1425"/>
+        <location filename="../bitmessageqt/__init__.py" line="1425"/>
         <source>Message trashed</source>
         <translation>Nachricht in den Papierkorb verschoben</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1559"/>
+        <location filename="../bitmessageqt/__init__.py" line="1559"/>
         <source>Error: Bitmessage addresses start with BM-   Please check %1</source>
         <translation>Fehler: Bitmessage Adressen starten mit BM-   Bitte überprüfen Sie %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1562"/>
+        <location filename="../bitmessageqt/__init__.py" line="1562"/>
         <source>Error: The address %1 is not typed or copied correctly. Please check it.</source>
         <translation>Fehler: Die Adresse %1 wurde nicht korrekt getippt oder kopiert. Bitte überprüfen.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1565"/>
+        <location filename="../bitmessageqt/__init__.py" line="1565"/>
         <source>Error: The address %1 contains invalid characters. Please check it.</source>
         <translation>Fehler: Die Adresse %1 beinhaltet ungültig Zeichen. Bitte überprüfen.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1568"/>
+        <location filename="../bitmessageqt/__init__.py" line="1568"/>
         <source>Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever.</source>
         <translation>Fehler: Die Adressversion von %1 ist zu hoch. Entweder Sie müssen Ihre Bitmessage Software aktualisieren oder Ihr Bekannter ist sehr clever.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1571"/>
+        <location filename="../bitmessageqt/__init__.py" line="1571"/>
         <source>Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance.</source>
         <translation>Fehler: Einige Daten die in der Adresse %1 codiert sind, sind zu kurz. Es könnte sein, dass etwas mit der Software Ihres Bekannten nicht stimmt.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1574"/>
+        <location filename="../bitmessageqt/__init__.py" line="1574"/>
         <source>Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance.</source>
         <translation>Fehler: Einige Daten die in der Adresse %1 codiert sind, sind zu lang. Es könnte sein, dass etwas mit der Software Ihres Bekannten nicht stimmt.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1577"/>
+        <location filename="../bitmessageqt/__init__.py" line="1577"/>
         <source>Error: Something is wrong with the address %1.</source>
         <translation>Fehler: Mit der Adresse %1 stimmt etwas nicht.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1644"/>
+        <location filename="../bitmessageqt/__init__.py" line="1644"/>
         <source>Error: You must specify a From address. If you don&apos;t have one, go to the &apos;Your Identities&apos; tab.</source>
         <translation>Fehler: Sie müssen eine Absenderadresse auswählen. Sollten Sie keine haben, wechseln Sie zum Reiter &quot;Ihre Identitäten&quot;.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1588"/>
+        <location filename="../bitmessageqt/__init__.py" line="1588"/>
         <source>Sending to your address</source>
         <translation>Sende zu Ihrer Adresse</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1588"/>
+        <location filename="../bitmessageqt/__init__.py" line="1588"/>
         <source>Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.</source>
         <translation>Fehler: Eine der Adressen an die Sie eine Nachricht schreiben (%1) ist Ihre. Leider kann die Bitmessage Software ihre eigenen Nachrichten nicht verarbeiten. Bitte verwenden Sie einen zweite Installation auf einem anderen Computer oder in einer VM.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1594"/>
+        <location filename="../bitmessageqt/__init__.py" line="1594"/>
         <source>Address version number</source>
         <translation>Adressversion</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1594"/>
+        <location filename="../bitmessageqt/__init__.py" line="1594"/>
         <source>Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version.</source>
         <translation>Bezüglich der Adresse %1, Bitmessage kann Adressen mit der Version %2 nicht verarbeiten. Möglicherweise müssen Sie Bitmessage auf die aktuelle Version aktualisieren.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1598"/>
+        <location filename="../bitmessageqt/__init__.py" line="1598"/>
         <source>Stream number</source>
         <translation>Datenstrom Nummer</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1598"/>
+        <location filename="../bitmessageqt/__init__.py" line="1598"/>
         <source>Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version.</source>
         <translation>Bezüglich der Adresse %1, Bitmessage kann den Datenstrom  mit der Version %2 nicht verarbeiten. Möglicherweise müssen Sie Bitmessage auf die aktuelle Version aktualisieren.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1603"/>
+        <location filename="../bitmessageqt/__init__.py" line="1603"/>
         <source>Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won&apos;t send until you connect.</source>
         <translation>Warnung: Sie sind aktuell nicht verbunden. Bitmessage wird die nötige Arbeit zum versenden verrichten, aber erst senden, wenn Sie verbunden sind.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1640"/>
+        <location filename="../bitmessageqt/__init__.py" line="1640"/>
         <source>Your &apos;To&apos; field is empty.</source>
         <translation>Ihr &quot;Empfänger&quot;-Feld ist leer.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1695"/>
+        <location filename="../bitmessageqt/__init__.py" line="1695"/>
         <source>Work is queued.</source>
         <translation>Arbeit in Warteschlange.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1717"/>
+        <location filename="../bitmessageqt/__init__.py" line="1717"/>
         <source>Right click one or more entries in your address book and select &apos;Send message to this address&apos;.</source>
         <translation>Klicken Sie mit rechts auf eine oder mehrere Einträge aus Ihrem Adressbuch und wählen Sie &quot;Nachricht an diese Adresse senden&quot;.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1805"/>
+        <location filename="../bitmessageqt/__init__.py" line="1805"/>
         <source>Work is queued. %1</source>
         <translation>Arbeit in Warteschlange. %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1874"/>
+        <location filename="../bitmessageqt/__init__.py" line="1874"/>
         <source>New Message</source>
         <translation>Neue Nachricht</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1874"/>
+        <location filename="../bitmessageqt/__init__.py" line="1874"/>
         <source>From </source>
         <translation>Von</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3274"/>
+        <location filename="../bitmessageqt/__init__.py" line="3282"/>
         <source>Address is valid.</source>
         <translation>Adresse ist gültig.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2436"/>
+        <location filename="../bitmessageqt/__init__.py" line="2440"/>
         <source>Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.</source>
         <translation>Fehler: Sie können eine Adresse nicht doppelt im Adressbuch speichern. Wenn Sie möchten, benennen Sie den existierenden Eintrag um.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2226"/>
+        <location filename="../bitmessageqt/__init__.py" line="2230"/>
         <source>The address you entered was invalid. Ignoring it.</source>
         <translation>Die von Ihnen eingegebene Adresse ist ungültig, sie wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2606"/>
+        <location filename="../bitmessageqt/__init__.py" line="2610"/>
         <source>Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want.</source>
         <translation>Fehler: Sie können eine Adresse nicht doppelt abonnieren. Wenn Sie möchten, benennen Sie den existierenden Eintrag um.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2042"/>
+        <location filename="../bitmessageqt/__init__.py" line="2046"/>
         <source>Restart</source>
         <translation>Neustart</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2036"/>
+        <location filename="../bitmessageqt/__init__.py" line="2040"/>
         <source>You must restart Bitmessage for the port number change to take effect.</source>
         <translation>Sie müssen Bitmessage neu starten, um den geänderten Port zu verwenden.</translation>
     </message>
@@ -418,173 +419,173 @@ Es ist wichtig, dass Sie diese Datei sichern. Möchten Sie die datei jetzt öffn
         <translation type="obsolete">Bitmessage wird den Proxy-Server ab jetzt verwenden, möglicherweise möchten Sie Bitmessage neu starten um bestehende Verbindungen zu schließen.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2223"/>
+        <location filename="../bitmessageqt/__init__.py" line="2227"/>
         <source>Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want.</source>
         <translation>Fehler: Sie können eine Adresse nicht doppelt zur Liste hinzufügen. Wenn Sie möchten, benennen Sie den existierenden Eintrag um.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2276"/>
+        <location filename="../bitmessageqt/__init__.py" line="2280"/>
         <source>Passphrase mismatch</source>
         <translation>Kennwortsatz nicht identisch</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2276"/>
+        <location filename="../bitmessageqt/__init__.py" line="2280"/>
         <source>The passphrase you entered twice doesn&apos;t match. Try again.</source>
         <translation>Die von Ihnen eingegebenen Kennwortsätze sind nicht identisch. Bitte neu versuchen.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2279"/>
+        <location filename="../bitmessageqt/__init__.py" line="2283"/>
         <source>Choose a passphrase</source>
         <translation>Wählen Sie einen Kennwortsatz</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2279"/>
+        <location filename="../bitmessageqt/__init__.py" line="2283"/>
         <source>You really do need a passphrase.</source>
         <translation>Sie benötigen wirklich einen Kennwortsatz.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2302"/>
+        <location filename="../bitmessageqt/__init__.py" line="2306"/>
         <source>All done. Closing user interface...</source>
         <translation>Alles fertig. Benutzer interface wird geschlossen...</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2376"/>
+        <location filename="../bitmessageqt/__init__.py" line="2380"/>
         <source>Address is gone</source>
         <translation>Adresse ist verloren</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2376"/>
+        <location filename="../bitmessageqt/__init__.py" line="2380"/>
         <source>Bitmessage cannot find your address %1. Perhaps you removed it?</source>
         <translation>Bitmassage kann Ihre Adresse %1 nicht finden. Haben Sie sie gelöscht?</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2380"/>
+        <location filename="../bitmessageqt/__init__.py" line="2384"/>
         <source>Address disabled</source>
         <translation>Adresse deaktiviert</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2380"/>
+        <location filename="../bitmessageqt/__init__.py" line="2384"/>
         <source>Error: The address from which you are trying to send is disabled. You&apos;ll have to enable it on the &apos;Your Identities&apos; tab before using it.</source>
         <translation>Fehler: Die Adresse von der Sie versuchen zu senden ist deaktiviert. Sie müssen sie unter dem Reiter &quot;Ihre Identitäten&quot; aktivieren bevor Sie fortfahren.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2433"/>
+        <location filename="../bitmessageqt/__init__.py" line="2437"/>
         <source>Entry added to the Address Book. Edit the label to your liking.</source>
         <translation>Eintrag dem Adressbuch hinzugefügt. Editieren Sie den Eintrag nach Belieben.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2498"/>
+        <location filename="../bitmessageqt/__init__.py" line="2502"/>
         <source>Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.</source>
         <translation>Objekt in den Papierkorb verschoben. Es gibt kein Benutzerinterface für den Papierkorb, aber die Daten sind noch auf Ihrer Festplatte wenn Sie sie wirklich benötigen.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2472"/>
+        <location filename="../bitmessageqt/__init__.py" line="2476"/>
         <source>Save As...</source>
         <translation>Speichern unter...</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2481"/>
+        <location filename="../bitmessageqt/__init__.py" line="2485"/>
         <source>Write error.</source>
         <translation>Fehler beim speichern.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2592"/>
+        <location filename="../bitmessageqt/__init__.py" line="2596"/>
         <source>No addresses selected.</source>
         <translation>Keine Adresse ausgewählt.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3055"/>
+        <location filename="../bitmessageqt/__init__.py" line="3063"/>
         <source>Options have been disabled because they either aren&apos;t applicable or because they haven&apos;t yet been implemented for your operating system.</source>
         <translation>
 Optionen wurden deaktiviert, da sie für Ihr Betriebssystem nicht relevant, oder noch nicht implementiert sind.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3256"/>
+        <location filename="../bitmessageqt/__init__.py" line="3264"/>
         <source>The address should start with &apos;&apos;BM-&apos;&apos;</source>
         <translation>Die Adresse sollte mit &quot;BM-&quot; beginnen</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3259"/>
+        <location filename="../bitmessageqt/__init__.py" line="3267"/>
         <source>The address is not typed or copied correctly (the checksum failed).</source>
         <translation>Die Adresse wurde nicht korrekt getippt oder kopiert (Prüfsumme falsch).</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3262"/>
+        <location filename="../bitmessageqt/__init__.py" line="3270"/>
         <source>The version number of this address is higher than this software can support. Please upgrade Bitmessage.</source>
         <translation>Die Versionsnummer dieser Adresse ist höher als diese Software unterstützt. Bitte installieren Sie die neuste Bitmessage Version.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3265"/>
+        <location filename="../bitmessageqt/__init__.py" line="3273"/>
         <source>The address contains invalid characters.</source>
         <translation>Diese Adresse beinhaltet ungültige Zeichen.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3268"/>
+        <location filename="../bitmessageqt/__init__.py" line="3276"/>
         <source>Some data encoded in the address is too short.</source>
         <translation>Die in der Adresse codierten Daten sind zu kurz.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3271"/>
+        <location filename="../bitmessageqt/__init__.py" line="3279"/>
         <source>Some data encoded in the address is too long.</source>
         <translation>Die in der Adresse codierten Daten sind zu lang.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3316"/>
+        <location filename="../bitmessageqt/__init__.py" line="3324"/>
         <source>You are using TCP port %1. (This can be changed in the settings).</source>
         <translation>Sie benutzen TCP-Port %1 (Dieser kann in den Einstellungen verändert werden).</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="524"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="524"/>
         <source>Bitmessage</source>
         <translation>Bitmessage</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="565"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="565"/>
         <source>To</source>
         <translation>An</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="567"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="567"/>
         <source>From</source>
         <translation>Von</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="569"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="569"/>
         <source>Subject</source>
         <translation>Betreff</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="539"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="539"/>
         <source>Received</source>
         <translation>Erhalten</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="540"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="540"/>
         <source>Inbox</source>
         <translation>Posteingang</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="541"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="541"/>
         <source>Load from Address book</source>
         <translation>Aus Adressbuch wählen</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="543"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="543"/>
         <source>Message:</source>
         <translation>Nachricht:</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="544"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="544"/>
         <source>Subject:</source>
         <translation>Betreff:</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="545"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="545"/>
         <source>Send to one or more specific people</source>
         <translation>Nachricht an eine oder mehrere spezifische Personen</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="546"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="546"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -597,277 +598,277 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="551"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="551"/>
         <source>To:</source>
         <translation>An:</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="552"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="552"/>
         <source>From:</source>
         <translation>Von:</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="553"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="553"/>
         <source>Broadcast to everyone who is subscribed to your address</source>
         <translation>Rundruf an jeden, der Ihre Adresse abonniert hat</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="555"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="555"/>
         <source>Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.</source>
         <translation>Beachten Sie, dass Rudrufe nur mit Ihrer Adresse verschlüsselt werden. Jeder, der Ihre Adresse kennt, kann diese Nachrichten lesen.</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="571"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="571"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="572"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="572"/>
         <source>Sent</source>
         <translation>Gesendet</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="576"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="576"/>
         <source>Label (not shown to anyone)</source>
         <translation>Bezeichnung (wird niemandem gezeigt)</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="605"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="605"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="580"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="580"/>
         <source>Stream</source>
         <translation>Datenstrom</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="581"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="581"/>
         <source>Your Identities</source>
         <translation>Ihre Identitäten</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="582"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="582"/>
         <source>Here you can subscribe to &apos;broadcast messages&apos; that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab.</source>
         <translation>Hier können Sie &quot;Rundruf Nachrichten&quot; abonnieren, die von anderen Benutzern versendet werden. Die Nachrichten tauchen in Ihrem Posteingang auf. (Die Adressen hier überschreiben die auf der Blacklist).</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="583"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="583"/>
         <source>Add new Subscription</source>
         <translation>Neues Abonnement anlegen</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="586"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="586"/>
         <source>Label</source>
         <translation>Bezeichnung</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="589"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="589"/>
         <source>Subscriptions</source>
         <translation>Abonnements</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="590"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="590"/>
         <source>The Address book is useful for adding names or labels to other people&apos;s Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the &apos;Add&apos; button, or from your inbox by right-clicking on a message.</source>
         <translation>Das Adressbuch ist nützlich um die Bitmessage-Adressen anderer Personen Namen oder Beschreibungen zuzuordnen, so dass Sie sie einfacher im Posteingang erkennen können. Sie können Adressen über &quot;Hinzufügen&quot; eintragen, oder über einen Rechtsklick auf eine Nachricht im Posteingang.</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="603"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="603"/>
         <source>Name or Label</source>
         <translation>Name oder Bezeichnung</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="598"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="598"/>
         <source>Use a Blacklist (Allow all incoming messages except those on the Blacklist)</source>
         <translation>Liste als Blacklist verwenden (Erlaubt alle eingehenden Nachrichten, außer von Adressen auf der Blacklist)</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="599"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="599"/>
         <source>Use a Whitelist (Block all incoming messages except those on the Whitelist)</source>
         <translation>Liste als Whitelist verwenden (Erlaubt keine eingehenden Nachrichten, außer von Adressen auf der Whitelist)</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="606"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="606"/>
         <source>Blacklist</source>
         <translation>Blacklist</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="608"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="608"/>
         <source>Stream #</source>
         <translation>Datenstrom #</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="610"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="610"/>
         <source>Connections</source>
         <translation>Verbindungen</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="611"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="611"/>
         <source>Total connections: 0</source>
         <translation>Verbindungen insgesamt: 0</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="612"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="612"/>
         <source>Since startup at asdf:</source>
         <translation>Seit start um asdf:</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="613"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="613"/>
         <source>Processed 0 person-to-person message.</source>
         <translation>0 Person-zu-Person-Nachrichten verarbeitet.</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="614"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="614"/>
         <source>Processed 0 public key.</source>
         <translation>0 öffentliche Schlüssel verarbeitet.</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="615"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="615"/>
         <source>Processed 0 broadcast.</source>
         <translation>0 Rundrufe verarbeitet.</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="616"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="616"/>
         <source>Network Status</source>
         <translation>Netzwerk status</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="617"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="617"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="627"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="627"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="624"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="624"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="620"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="620"/>
         <source>Import keys</source>
         <translation>Schlüssel importieren</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="621"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="621"/>
         <source>Manage keys</source>
         <translation>Schlüssel verwalten</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="626"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="626"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="628"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="628"/>
         <source>Regenerate deterministic addresses</source>
         <translation>Deterministische Adressen neu generieren</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="629"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="629"/>
         <source>Delete all trashed messages</source>
         <translation>Alle Nachrichten im Papierkorb löschen</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="644"/>
+        <location filename="../bitmessageqt/__init__.py" line="644"/>
         <source>Message sent. Sent at %1</source>
         <translation>Nachricht gesendet. gesendet am %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1197"/>
+        <location filename="../bitmessageqt/__init__.py" line="1197"/>
         <source>Chan name needed</source>
         <translation>Chan name benötigt</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1197"/>
+        <location filename="../bitmessageqt/__init__.py" line="1197"/>
         <source>You didn&apos;t enter a chan name.</source>
         <translation>Sie haben keinen Chan-Namen eingegeben.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1217"/>
+        <location filename="../bitmessageqt/__init__.py" line="1217"/>
         <source>Address already present</source>
         <translation>Adresse bereits vorhanden</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1217"/>
+        <location filename="../bitmessageqt/__init__.py" line="1217"/>
         <source>Could not add chan because it appears to already be one of your identities.</source>
         <translation>Chan konnte nicht erstellt werden, da es sich bereits um eine Ihrer Identitäten handelt.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1222"/>
+        <location filename="../bitmessageqt/__init__.py" line="1222"/>
         <source>Success</source>
         <translation>Erfolgreich</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1192"/>
+        <location filename="../bitmessageqt/__init__.py" line="1192"/>
         <source>Successfully created chan. To let others join your chan, give them the chan name and this Bitmessage address: %1. This address also appears in &apos;Your Identities&apos;.</source>
         <translation>Chan erfolgreich erstellt. Um andere diesem Chan beitreten zu lassen, geben Sie ihnen den Chan-Namen und die Bitmessage-Adresse: %1. Diese Adresse befindet sich auch unter &quot;Ihre Identitäten&quot;.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1201"/>
+        <location filename="../bitmessageqt/__init__.py" line="1201"/>
         <source>Address too new</source>
         <translation>Adresse zu neu</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1201"/>
+        <location filename="../bitmessageqt/__init__.py" line="1201"/>
         <source>Although that Bitmessage address might be valid, its version number is too new for us to handle. Perhaps you need to upgrade Bitmessage.</source>
         <translation>Obwohl diese Bitmessage-Adresse gültig ist, ist ihre Versionsnummer zu hoch um verarbeitet zu werden. Vermutlich müssen Sie eine neuere Version von Bitmessage installieren.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1205"/>
+        <location filename="../bitmessageqt/__init__.py" line="1205"/>
         <source>Address invalid</source>
         <translation>Adresse ungültig</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1205"/>
+        <location filename="../bitmessageqt/__init__.py" line="1205"/>
         <source>That Bitmessage address is not valid.</source>
         <translation>Diese Bitmessage-Adresse ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1213"/>
+        <location filename="../bitmessageqt/__init__.py" line="1213"/>
         <source>Address does not match chan name</source>
         <translation>Adresse stimmt nicht mit dem Chan-Namen überein</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1213"/>
+        <location filename="../bitmessageqt/__init__.py" line="1213"/>
         <source>Although the Bitmessage address you entered was valid, it doesn&apos;t match the chan name.</source>
         <translation>Obwohl die Bitmessage-Adresse die Sie eingegeben haben gültig ist, stimmt diese nicht mit dem Chan-Namen überein.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1222"/>
+        <location filename="../bitmessageqt/__init__.py" line="1222"/>
         <source>Successfully joined chan. </source>
         <translation>Chan erfolgreich beigetreten.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="2042"/>
+        <location filename="../bitmessageqt/__init__.py" line="2046"/>
         <source>Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any).</source>
         <translation>Bitmessage wird ab sofort den Proxy-Server verwenden, aber eventuell möchten Sie Bitmessage neu starten um bereits bestehende Verbindungen zu schließen.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3237"/>
+        <location filename="../bitmessageqt/__init__.py" line="3245"/>
         <source>This is a chan address. You cannot use it as a pseudo-mailing list.</source>
         <translation>Dies ist eine Chan-Adresse. Sie können sie nicht als Pseudo-Mailingliste verwenden.</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="557"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="557"/>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="558"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="558"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="562"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="562"/>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="630"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="630"/>
         <source>Join / Create chan</source>
         <translation>Chan beitreten / erstellen</translation>
     </message>
@@ -897,32 +898,32 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Anfrag für den Verschlüsselungscode gesendet. Warte auf Antwort. Angefragt am %1</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="173"/>
+        <location filename="../bitmessageqt/__init__.py" line="173"/>
         <source>Mark Unread</source>
         <translation>Als ungelesen markieren</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="1728"/>
+        <location filename="../bitmessageqt/__init__.py" line="1728"/>
         <source>Fetched address from namecoin identity.</source>
         <translation>Adresse aus Namecoin Identität geholt.</translation>
     </message>
     <message>
-        <location filename="__init__.py" line="3196"/>
+        <location filename="../bitmessageqt/__init__.py" line="3204"/>
         <source>Testing...</source>
         <translation>teste...</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="542"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="542"/>
         <source>Fetch Namecoin ID</source>
         <translation>Hole Namecoin ID</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="623"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="623"/>
         <source>Ctrl+Q</source>
-        <translation>Strg+Q</translation>
+        <translation type="unfinished">Strg+Q</translation>
     </message>
     <message>
-        <location filename="bitmessageui.py" line="625"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="625"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
@@ -930,99 +931,99 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NewAddressDialog</name>
     <message>
-        <location filename="newaddressdialog.py" line="173"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="173"/>
         <source>Create new Address</source>
         <translation>Neue Adresse erstellen</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="174"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="174"/>
         <source>Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a &quot;deterministic&quot; address.
 The &apos;Random Number&apos; option is selected by default but deterministic addresses have several pros and cons:</source>
         <translation>Sie können so viele Adressen generieren wie Sie möchten. Es ist sogar empfohlen neue Adressen zu verwenden und alte fallen zu lassen. Sie können Adressen durch Zufallszahlen erstellen lassen, oder unter Verwendung eines Kennwortsatzes. Wenn Sie einen Kennwortsatz verwenden, nennt man dies eine &quot;deterministische&quot; Adresse.
 Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen einige Vor- und Nachteile:</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="176"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Pros:&lt;br/&gt;&lt;/span&gt;You can recreate your addresses on any computer from memory. &lt;br/&gt;You need-not worry about backing up your keys.dat file as long as you can remember your passphrase. &lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Cons:&lt;br/&gt;&lt;/span&gt;You must remember (or write down) your passphrase if you expect to be able to recreate your keys if they are lost. &lt;br/&gt;You must remember the address version number and the stream number along with your passphrase. &lt;br/&gt;If you choose a weak passphrase and someone on the Internet can brute-force it, they can read your messages and send messages as you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Vorteile:&lt;br/&gt;&lt;/span&gt;Sie können ihre Adresse an jedem Computer aus dem Gedächtnis regenerieren. &lt;br/&gt;Sie brauchen sich keine Sorgen um das Sichern ihrer Schlüssel machen solange Sie sich den Kennwortsatz merken. &lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Nachteile:&lt;br/&gt;&lt;/span&gt;Sie müssen sich den Kennowrtsatz merken (oder aufschreiben) wenn Sie in der Lage sein wollen ihre Schlüssel wiederherzustellen. &lt;br/&gt;Sie müssen sich die Adressversion und die Datenstrom Nummer zusammen mit dem Kennwortsatz merken. &lt;br/&gt;Wenn Sie einen schwachen Kennwortsatz wählen und jemand kann ihn erraten oder durch ausprobieren herausbekommen, kann dieser Ihre Nachrichten lesen, oder in ihrem Namen Nachrichten senden..&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; </translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="177"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="177"/>
         <source>Use a random number generator to make an address</source>
         <translation>Lassen Sie eine Adresse mittels Zufallsgenerator erstellen</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="178"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="178"/>
         <source>Use a passphrase to make addresses</source>
         <translation>Benutzen Sie einen Kennwortsatz um eine Adresse erstellen zu lassen</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="179"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="179"/>
         <source>Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter</source>
         <translation>Verwenden Sie einige Minuten extra Rechenleistung um die Adresse(n) ein bis zwei Zeichen kürzer zu machen</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="180"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="180"/>
         <source>Make deterministic addresses</source>
         <translation>Deterministische Adresse erzeugen</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="181"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="181"/>
         <source>Address version number: 3</source>
         <translation>Adress-Versionsnummer: 3</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="182"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="182"/>
         <source>In addition to your passphrase, you must remember these numbers:</source>
         <translation>Zusätzlich zu Ihrem Kennwortsatz müssen Sie sich diese Zahlen merken:</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="183"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="183"/>
         <source>Passphrase</source>
         <translation>Kennwortsatz</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="184"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="184"/>
         <source>Number of addresses to make based on your passphrase:</source>
         <translation>Anzahl Adressen die basierend auf diesem Kennwortsatz erzeugt werden sollen:</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="185"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="185"/>
         <source>Stream number: 1</source>
         <translation>Datenstrom Nummer: 1</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="186"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="186"/>
         <source>Retype passphrase</source>
         <translation>Kennwortsatz erneut eingeben</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="187"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="187"/>
         <source>Randomly generate address</source>
         <translation>Zufällig generierte Adresse</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="188"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="188"/>
         <source>Label (not shown to anyone except you)</source>
         <translation>Bezeichnung (Wird niemandem außer Ihnen gezeigt)</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="189"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="189"/>
         <source>Use the most available stream</source>
         <translation>Verwendung des am besten verfügbaren Datenstroms</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="190"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="190"/>
         <source> (best if this is the first of many addresses you will create)</source>
         <translation>(zum generieren der erste Adresse empfohlen)</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="191"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="191"/>
         <source>Use the same stream as an existing address</source>
         <translation>Verwendung des gleichen Datenstroms wie eine bestehende Adresse</translation>
     </message>
     <message>
-        <location filename="newaddressdialog.py" line="192"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="192"/>
         <source>(saves you some bandwidth and processing power)</source>
         <translation>(Dies erspart Ihnen etwas an Bandbreite und Rechenleistung)</translation>
     </message>
@@ -1030,17 +1031,17 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
 <context>
     <name>NewSubscriptionDialog</name>
     <message>
-        <location filename="newsubscriptiondialog.py" line="57"/>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="57"/>
         <source>Add new entry</source>
         <translation>Neuen Eintrag erstellen</translation>
     </message>
     <message>
-        <location filename="newsubscriptiondialog.py" line="58"/>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="58"/>
         <source>Label</source>
         <translation>Name oder Bezeichnung</translation>
     </message>
     <message>
-        <location filename="newsubscriptiondialog.py" line="59"/>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="59"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
@@ -1048,27 +1049,27 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
 <context>
     <name>SpecialAddressBehaviorDialog</name>
     <message>
-        <location filename="specialaddressbehavior.py" line="59"/>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="59"/>
         <source>Special Address Behavior</source>
         <translation>Spezielles Adressverhalten</translation>
     </message>
     <message>
-        <location filename="specialaddressbehavior.py" line="60"/>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="60"/>
         <source>Behave as a normal address</source>
         <translation>Wie eine normale Adresse verhalten</translation>
     </message>
     <message>
-        <location filename="specialaddressbehavior.py" line="61"/>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="61"/>
         <source>Behave as a pseudo-mailing-list address</source>
         <translation>Wie eine Pseudo-Mailinglistenadresse verhalten</translation>
     </message>
     <message>
-        <location filename="specialaddressbehavior.py" line="62"/>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="62"/>
         <source>Mail received to a pseudo-mailing-list address will be automatically broadcast to subscribers (and thus will be public).</source>
         <translation>Nachrichten an eine Pseudo-Mailinglistenadresse werden automatisch zu allen Abbonenten weitergeleitet (Der Inhalt ist dann öffentlich).</translation>
     </message>
     <message>
-        <location filename="specialaddressbehavior.py" line="63"/>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="63"/>
         <source>Name of the pseudo-mailing-list:</source>
         <translation>Name der Pseudo-Mailingliste:</translation>
     </message>
@@ -1076,32 +1077,32 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="about.py" line="57"/>
+        <location filename="../bitmessageqt/about.py" line="57"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <location filename="about.py" line="58"/>
+        <location filename="../bitmessageqt/about.py" line="58"/>
         <source>PyBitmessage</source>
         <translation>PyBitmessage</translation>
     </message>
     <message>
-        <location filename="about.py" line="59"/>
+        <location filename="../bitmessageqt/about.py" line="59"/>
         <source>version ?</source>
         <translation>Version ?</translation>
     </message>
     <message utf8="true">
-        <location filename="about.py" line="60"/>
+        <location filename="../bitmessageqt/about.py" line="60"/>
         <source>Copyright © 2013 Jonathan Warren</source>
         <translation>Copyright © 2013 Jonathan Warren</translation>
     </message>
     <message>
-        <location filename="about.py" line="61"/>
+        <location filename="../bitmessageqt/about.py" line="61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Distributed under the MIT/X11 software license; see &lt;a href=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.opensource.org/licenses/mit-license.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Veröffentlicht unter der MIT/X11 Software-Lizenz; see &lt;a href=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.opensource.org/licenses/mit-license.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="about.py" line="62"/>
+        <location filename="../bitmessageqt/about.py" line="62"/>
         <source>This is Beta software.</source>
         <translation>Diese ist Beta-Software.</translation>
     </message>
@@ -1109,22 +1110,22 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
 <context>
     <name>connectDialog</name>
     <message>
-        <location filename="connect.py" line="56"/>
+        <location filename="../bitmessageqt/connect.py" line="56"/>
         <source>Bitmessage</source>
         <translation>Internetverbindung</translation>
     </message>
     <message>
-        <location filename="connect.py" line="57"/>
+        <location filename="../bitmessageqt/connect.py" line="57"/>
         <source>Bitmessage won&apos;t connect to anyone until you let it. </source>
         <translation>Bitmessage wird sich nicht verbinden, wenn Sie es nicht möchten.</translation>
     </message>
     <message>
-        <location filename="connect.py" line="58"/>
+        <location filename="../bitmessageqt/connect.py" line="58"/>
         <source>Connect now</source>
         <translation>Jetzt verbinden</translation>
     </message>
     <message>
-        <location filename="connect.py" line="59"/>
+        <location filename="../bitmessageqt/connect.py" line="59"/>
         <source>Let me configure special network settings first</source>
         <translation>Zunächst spezielle Nertzwerkeinstellungen vornehmen</translation>
     </message>
@@ -1132,17 +1133,17 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
 <context>
     <name>helpDialog</name>
     <message>
-        <location filename="help.py" line="45"/>
+        <location filename="../bitmessageqt/help.py" line="45"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="help.py" line="46"/>
+        <location filename="../bitmessageqt/help.py" line="46"/>
         <source>&lt;a href=&quot;http://Bitmessage.org/wiki/PyBitmessage_Help&quot;&gt;http://Bitmessage.org/wiki/PyBitmessage_Help&lt;/a&gt;</source>
         <translation>&lt;a href=&quot;http://Bitmessage.org/wiki/PyBitmessage_Help&quot;&gt;http://Bitmessage.org/wiki/PyBitmessage_Help&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="help.py" line="47"/>
+        <location filename="../bitmessageqt/help.py" line="47"/>
         <source>As Bitmessage is a collaborative project, help can be found online in the Bitmessage Wiki:</source>
         <translation>Bei Bitmessage handelt es sich um ein kollaboratives Projekt, Hilfe finden Sie online in Bitmessage-Wiki:</translation>
     </message>
@@ -1150,27 +1151,27 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
 <context>
     <name>iconGlossaryDialog</name>
     <message>
-        <location filename="iconglossary.py" line="82"/>
+        <location filename="../bitmessageqt/iconglossary.py" line="82"/>
         <source>Icon Glossary</source>
         <translation>Icon Glossar</translation>
     </message>
     <message>
-        <location filename="iconglossary.py" line="83"/>
+        <location filename="../bitmessageqt/iconglossary.py" line="83"/>
         <source>You have no connections with other peers. </source>
         <translation>Sie haben keine Verbindung mit anderen Netzwerkteilnehmern.</translation>
     </message>
     <message>
-        <location filename="iconglossary.py" line="84"/>
+        <location filename="../bitmessageqt/iconglossary.py" line="84"/>
         <source>You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn&apos;t configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node.</source>
         <translation>Sie haben mindestes eine Verbindung mit einem Netzwerkteilnehmer über eine ausgehende Verbindung, aber Sie haben noch keine eingehende Verbindung. Ihre Firewall oder Router ist vermutlich nicht richtig konfiguriert um eingehende TCP-Verbindungen an Ihren Computer weiterzuleiten. Bittmessage wird gut funktionieren, jedoch helfen Sie dem Netzwerk, wenn Sie eingehende Verbindungen erlauben. Es hilft auch Ihnen schneller und mehr Verbindungen ins Netzwerk aufzubauen.</translation>
     </message>
     <message>
-        <location filename="iconglossary.py" line="85"/>
+        <location filename="../bitmessageqt/iconglossary.py" line="85"/>
         <source>You are using TCP port ?. (This can be changed in the settings).</source>
         <translation>Sie benutzen TCP-Port ?. (Dies kann in den Einstellungen verändert werden).</translation>
     </message>
     <message>
-        <location filename="iconglossary.py" line="86"/>
+        <location filename="../bitmessageqt/iconglossary.py" line="86"/>
         <source>You do have connections with other peers and your firewall is correctly configured.</source>
         <translation>Sie haben Verbindungen mit anderen Netzwerkteilnehmern und Ihre Firewall ist richtig konfiguriert.</translation>
     </message>
@@ -1178,42 +1179,42 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
 <context>
     <name>newChanDialog</name>
     <message>
-        <location filename="newchandialog.py" line="97"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="97"/>
         <source>Dialog</source>
         <translation>Chan beitreten / erstellen</translation>
     </message>
     <message>
-        <location filename="newchandialog.py" line="98"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="98"/>
         <source>Create a new chan</source>
         <translation>Neuen Chan erstellen</translation>
     </message>
     <message>
-        <location filename="newchandialog.py" line="103"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="103"/>
         <source>Join a chan</source>
         <translation>Einem Chan beitreten</translation>
     </message>
     <message>
-        <location filename="newchandialog.py" line="100"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="100"/>
         <source>Create a chan</source>
         <translation>Chan erstellen</translation>
     </message>
     <message>
-        <location filename="newchandialog.py" line="105"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="105"/>
         <source>Chan name:</source>
         <translation>Chan-Name:</translation>
     </message>
     <message>
-        <location filename="newchandialog.py" line="104"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="104"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A chan exists when a group of people share the same decryption keys. The keys and bitmessage address used by a chan are generated from a human-friendly word or phrase (the chan name). To send a message to everyone in the chan, send a normal person-to-person message to the chan address.&lt;/p&gt;&lt;p&gt;Chans are experimental and completely unmoderatable.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ein Chan existiert, wenn eine Gruppe von Leuten sich den gleichen Entschlüsselungscode teilen. Die Schlüssel und Bitmessage-Adressen werden basierend auf einem lesbaren Wort oder Satz generiert (Dem Chan-Namen). Um eine Nachricht an den Chan zu senden, senden Sie eine normale Person-zu-Person-Nachricht an die Chan-Adresse.&lt;/p&gt;&lt;p&gt;Chans sind experimentell and völlig unmoderierbar.&lt;/p&gt;&lt;br&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="newchandialog.py" line="106"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="106"/>
         <source>Chan bitmessage address:</source>
         <translation>Chan-Bitmessage-Adresse:</translation>
     </message>
     <message>
-        <location filename="newchandialog.py" line="101"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="101"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a name for your chan. If you choose a sufficiently complex chan name (like a strong and unique passphrase) and none of your friends share it publicly then the chan will be secure and private. If you and someone else both create a chan with the same chan name then it is currently very likely that they will be the same chan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Geben Sie einen Namen für Ihren Chan ein. Wenn Sie einen ausreichend komplexen Chan-Namen wählen (Wie einen starkes und einzigartigen Kennwortsatz) und keiner Ihrer Freunde ihn öffentlich weitergibt, wird der Chan sicher und privat bleiben. Wenn eine andere Person einen Chan mit dem gleichen Namen erzeugt, werden diese zu einem Chan.&lt;/p&gt;&lt;br&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -1221,57 +1222,57 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
 <context>
     <name>regenerateAddressesDialog</name>
     <message>
-        <location filename="regenerateaddresses.py" line="104"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="104"/>
         <source>Regenerate Existing Addresses</source>
         <translation>Bestehende Adresse regenerieren</translation>
     </message>
     <message>
-        <location filename="regenerateaddresses.py" line="105"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="105"/>
         <source>Regenerate existing addresses</source>
         <translation>Bestehende Adresse regenerieren</translation>
     </message>
     <message>
-        <location filename="regenerateaddresses.py" line="106"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="106"/>
         <source>Passphrase</source>
         <translation>Kennwortsatz</translation>
     </message>
     <message>
-        <location filename="regenerateaddresses.py" line="107"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="107"/>
         <source>Number of addresses to make based on your passphrase:</source>
         <translation>Anzahl der Adressen die basierend auf diesem Kennwortsatz erzeugt werden sollen:</translation>
     </message>
     <message>
-        <location filename="regenerateaddresses.py" line="108"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="108"/>
         <source>Address version Number:</source>
         <translation>Adress-Versionsnummer:</translation>
     </message>
     <message>
-        <location filename="regenerateaddresses.py" line="109"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="109"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
-        <location filename="regenerateaddresses.py" line="110"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="110"/>
         <source>Stream number:</source>
         <translation>Stream Nummer:</translation>
     </message>
     <message>
-        <location filename="regenerateaddresses.py" line="111"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="111"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="regenerateaddresses.py" line="112"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="112"/>
         <source>Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter</source>
         <translation>Verwenden Sie einige Minuten extra Rechenleistung um die Adresse(n) ein bis zwei Zeichen kürzer zu machen</translation>
     </message>
     <message>
-        <location filename="regenerateaddresses.py" line="113"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="113"/>
         <source>You must check (or not check) this box just like you did (or didn&apos;t) when you made your addresses the first time.</source>
         <translation>Sie müssen diese Option auswählen (oder nicht auswählen) wie Sie es gemacht haben, als Sie Ihre Adresse das erste mal erstellt haben.</translation>
     </message>
     <message>
-        <location filename="regenerateaddresses.py" line="114"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="114"/>
         <source>If you have previously made deterministic addresses but lost them due to an accident (like hard drive failure), you can regenerate them here. If you used the random number generator to make your addresses then this form will be of no use to you.</source>
         <translation>Wenn Sie bereits deterministische Adressen erstellt haben, aber diese durch einen Unfall wie eine defekte Festplatte verloren haben, können Sie sie hier regenerieren. Wenn Sie den Zufallsgenerator verwendet haben um Ihre Adressen erstmals zu erstellen, kann dieses Formular Ihnen nicht helfen.</translation>
     </message>
@@ -1279,209 +1280,214 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
 <context>
     <name>settingsDialog</name>
     <message>
-        <location filename="settings.py" line="326"/>
+        <location filename="../bitmessageqt/settings.py" line="335"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="settings.py" line="331"/>
+        <location filename="../bitmessageqt/settings.py" line="340"/>
         <source>Start Bitmessage on user login</source>
         <translation>Bitmessage nach dem Hochfahren automatisch starten</translation>
     </message>
     <message>
-        <location filename="settings.py" line="327"/>
+        <location filename="../bitmessageqt/settings.py" line="336"/>
         <source>Start Bitmessage in the tray (don&apos;t show main window)</source>
         <translation>Bitmessage minimiert starten (Zeigt das Hauptfenster nicht an)</translation>
     </message>
     <message>
-        <location filename="settings.py" line="329"/>
+        <location filename="../bitmessageqt/settings.py" line="338"/>
         <source>Minimize to tray</source>
         <translation>In den Systemtray minimieren</translation>
     </message>
     <message>
-        <location filename="settings.py" line="328"/>
+        <location filename="../bitmessageqt/settings.py" line="337"/>
         <source>Show notification when message received</source>
         <translation>Benachrichtigung anzeigen, wenn eine Nachricht eintrifft</translation>
     </message>
     <message>
-        <location filename="settings.py" line="332"/>
+        <location filename="../bitmessageqt/settings.py" line="341"/>
         <source>Run in Portable Mode</source>
         <translation>In portablem Modus arbeiten</translation>
     </message>
     <message>
-        <location filename="settings.py" line="330"/>
+        <location filename="../bitmessageqt/settings.py" line="339"/>
         <source>In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.</source>
         <translation>Im portablen Modus werden Nachrichten und Konfigurationen im gleichen Ordner abgelegt, wie sich das Programm selbst befindet anstelle im normalen Anwendungsdaten-Ordner. Das macht es möglich Bitmessage auf einem USB-Stick zu betreiben.</translation>
     </message>
     <message>
-        <location filename="settings.py" line="334"/>
+        <location filename="../bitmessageqt/settings.py" line="344"/>
         <source>User Interface</source>
         <translation>Benutzerinterface</translation>
     </message>
     <message>
-        <location filename="settings.py" line="335"/>
+        <location filename="../bitmessageqt/settings.py" line="345"/>
         <source>Listening port</source>
         <translation>TCP-Port</translation>
     </message>
     <message>
-        <location filename="settings.py" line="336"/>
+        <location filename="../bitmessageqt/settings.py" line="346"/>
         <source>Listen for connections on port:</source>
         <translation>Wartet auf Verbindungen auf Port:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="337"/>
+        <location filename="../bitmessageqt/settings.py" line="347"/>
         <source>Proxy server / Tor</source>
         <translation>Proxy-Server / Tor</translation>
     </message>
     <message>
-        <location filename="settings.py" line="338"/>
+        <location filename="../bitmessageqt/settings.py" line="348"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="339"/>
+        <location filename="../bitmessageqt/settings.py" line="349"/>
         <source>none</source>
         <translation>keiner</translation>
     </message>
     <message>
-        <location filename="settings.py" line="340"/>
+        <location filename="../bitmessageqt/settings.py" line="350"/>
         <source>SOCKS4a</source>
         <translation>SOCKS4a</translation>
     </message>
     <message>
-        <location filename="settings.py" line="341"/>
+        <location filename="../bitmessageqt/settings.py" line="351"/>
         <source>SOCKS5</source>
         <translation>SOCKS5</translation>
     </message>
     <message>
-        <location filename="settings.py" line="342"/>
+        <location filename="../bitmessageqt/settings.py" line="352"/>
         <source>Server hostname:</source>
         <translation>Servername:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="361"/>
+        <location filename="../bitmessageqt/settings.py" line="371"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="344"/>
+        <location filename="../bitmessageqt/settings.py" line="354"/>
         <source>Authentication</source>
         <translation>Authentifizierung</translation>
     </message>
     <message>
-        <location filename="settings.py" line="362"/>
+        <location filename="../bitmessageqt/settings.py" line="372"/>
         <source>Username:</source>
         <translation>Benutzername:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="346"/>
+        <location filename="../bitmessageqt/settings.py" line="356"/>
         <source>Pass:</source>
         <translation>Kennwort:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="348"/>
+        <location filename="../bitmessageqt/settings.py" line="358"/>
         <source>Network Settings</source>
         <translation>Netzwerkeinstellungen</translation>
     </message>
     <message>
-        <location filename="settings.py" line="349"/>
+        <location filename="../bitmessageqt/settings.py" line="359"/>
         <source>When someone sends you a message, their computer must first complete some work. The difficulty of this work, by default, is 1. You may raise this default for new addresses you create by changing the values here. Any new addresses you create will require senders to meet the higher difficulty. There is one exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically notify them when you next send a message that they need only complete the minimum amount of work: difficulty 1. </source>
         <translation>Wenn jemand Ihnen eine Nachricht schickt, muss der absendende Computer erst einige Arbeit verrichten. Die Schwierigkeit dieser Arbeit ist standardmäßig 1. Sie können diesen Wert für alle neuen Adressen, die Sie generieren hier ändern. Es gibt eine Ausnahme: Wenn Sie einen Freund oder Bekannten in Ihr Adressbuch übernehmen, wird Bitmessage ihn mit der nächsten Nachricht automatisch informieren, dass er nur noch die minimale Arbeit verrichten muss: Schwierigkeit 1.</translation>
     </message>
     <message>
-        <location filename="settings.py" line="350"/>
+        <location filename="../bitmessageqt/settings.py" line="360"/>
         <source>Total difficulty:</source>
         <translation>Gesamtschwierigkeit:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="351"/>
+        <location filename="../bitmessageqt/settings.py" line="361"/>
         <source>Small message difficulty:</source>
         <translation>Schwierigkeit für kurze Nachrichten:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="352"/>
+        <location filename="../bitmessageqt/settings.py" line="362"/>
         <source>The &apos;Small message difficulty&apos; mostly only affects the difficulty of sending small messages. Doubling this value makes it almost twice as difficult to send a small message but doesn&apos;t really affect large messages.</source>
         <translation>Die &quot;Schwierigkeit für kurze Nachrichten&quot; trifft nur auf das senden kurzen Nachrichten zu. Verdoppelung des Wertes macht es fast doppelt so schwer kurze Nachrichten zu senden, aber hat keinen Effekt bei langen Nachrichten.</translation>
     </message>
     <message>
-        <location filename="settings.py" line="353"/>
+        <location filename="../bitmessageqt/settings.py" line="363"/>
         <source>The &apos;Total difficulty&apos; affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work.</source>
         <translation>Die &quot;Gesammtschwierigkeit&quot; beeinflusst die absolute menge Arbeit die ein Sender verrichten muss. Verdoppelung dieses Wertes verdoppelt die Menge der Arbeit.</translation>
     </message>
     <message>
-        <location filename="settings.py" line="354"/>
+        <location filename="../bitmessageqt/settings.py" line="364"/>
         <source>Demanded difficulty</source>
         <translation>Geforderte Schwierigkeit</translation>
     </message>
     <message>
-        <location filename="settings.py" line="355"/>
+        <location filename="../bitmessageqt/settings.py" line="365"/>
         <source>Here you may set the maximum amount of work you are willing to do to send a message to another person. Setting these values to 0 means that any value is acceptable.</source>
         <translation>hier setzen Sie die maximale Arbeit die Sie bereit sind zu verrichten um eine Nachricht an eine andere Person zu verwenden. Ein Wert von 0 bedeutet, dass Sie jede Arbeit akzeptieren.</translation>
     </message>
     <message>
-        <location filename="settings.py" line="356"/>
+        <location filename="../bitmessageqt/settings.py" line="366"/>
         <source>Maximum acceptable total difficulty:</source>
         <translation>Maximale akzeptierte Gesammtschwierigkeit:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="357"/>
+        <location filename="../bitmessageqt/settings.py" line="367"/>
         <source>Maximum acceptable small message difficulty:</source>
         <translation>Maximale akzeptierte Schwierigkeit für kurze Nachrichten:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="358"/>
+        <location filename="../bitmessageqt/settings.py" line="368"/>
         <source>Max acceptable difficulty</source>
         <translation>Maximale akzeptierte Schwierigkeit</translation>
     </message>
     <message>
-        <location filename="settings.py" line="347"/>
+        <location filename="../bitmessageqt/settings.py" line="357"/>
         <source>Listen for incoming connections when using proxy</source>
         <translation>Auf eingehende Verdindungen warten, auch wenn eine Proxy-Server verwendet wird</translation>
     </message>
     <message>
-        <location filename="settings.py" line="333"/>
+        <location filename="../bitmessageqt/settings.py" line="342"/>
         <source>Willingly include unencrypted destination address when sending to a mobile device</source>
         <translation>Willentlich die unverschlüsselte Adresse des Empfängers übertragen, wenn an ein mobiles Gerät gesendet wird</translation>
     </message>
     <message>
-        <location filename="settings.py" line="359"/>
+        <location filename="../bitmessageqt/settings.py" line="369"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bitmessage can utilize a different Bitcoin-based program called Namecoin to make addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage address, you can simply tell him to send a message to &lt;span style=&quot; font-style:italic;&quot;&gt;test. &lt;/span&gt;&lt;/p&gt;&lt;p&gt;(Getting your own Bitmessage address into Namecoin is still rather difficult).&lt;/p&gt;&lt;p&gt;Bitmessage can use either namecoind directly or a running nmcontrol instance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bitmessage kann ein anderes Bitcoin basiertes Programm namens Namecoin nutzen um Adressen leserlicher zu machen. Zum Beispiel: Anstelle Ihrem Bekannten Ihre lange Bitmessage-Adresse vorzulesen, können Sie ihm einfach sagen, er soll eine Nachricht an &lt;span style=&quot; font-style:italic;&quot;&gt;test &lt;/span&gt;senden.&lt;/p&gt;&lt;p&gt; (Ihre Bitmessage-Adresse in Namecoin zu speichern ist noch sehr umständlich)&lt;/p&gt;&lt;p&gt;Bitmessage kann direkt namecoind verwenden, oder eine nmcontrol Instanz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="settings.py" line="360"/>
+        <location filename="../bitmessageqt/settings.py" line="370"/>
         <source>Host:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="363"/>
+        <location filename="../bitmessageqt/settings.py" line="373"/>
         <source>Password:</source>
         <translation>Kennwort:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="364"/>
+        <location filename="../bitmessageqt/settings.py" line="374"/>
         <source>Test</source>
         <translation>Verbindung testen</translation>
     </message>
     <message>
-        <location filename="settings.py" line="365"/>
+        <location filename="../bitmessageqt/settings.py" line="375"/>
         <source>Connect to:</source>
         <translation>Verbinde mit:</translation>
     </message>
     <message>
-        <location filename="settings.py" line="366"/>
+        <location filename="../bitmessageqt/settings.py" line="376"/>
         <source>Namecoind</source>
         <translation>Namecoind</translation>
     </message>
     <message>
-        <location filename="settings.py" line="367"/>
+        <location filename="../bitmessageqt/settings.py" line="377"/>
         <source>NMControl</source>
         <translation>NMControl</translation>
     </message>
     <message>
-        <location filename="settings.py" line="368"/>
+        <location filename="../bitmessageqt/settings.py" line="378"/>
         <source>Namecoin integration</source>
         <translation>Namecoin Integration</translation>
     </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="343"/>
+        <source>Override automatic language localization (use countycode or language code, e.g. &apos;en_US&apos; or &apos;en&apos;):</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/translations/bitmessage_en_pirate.pro

@@ -0,0 +1,33 @@
+SOURCES	= 	../addresses.py\
+			../bitmessagemain.py\
+			../class_addressGenerator.py\
+			../class_outgoingSynSender.py\
+			../class_receiveDataThread.py\
+			../class_sendDataThread.py\
+			../class_singleCleaner.py\
+			../class_singleListener.py\
+			../class_singleWorker.py\
+			../class_sqlThread.py\
+			../helper_bitcoin.py\
+			../helper_bootstrap.py\
+			../helper_generic.py\
+			../helper_inbox.py\
+			../helper_sent.py\
+			../helper_startup.py\
+			../shared.py\
+			../bitmessageqt/__init__.py\
+			../bitmessageqt/about.py\
+			../bitmessageqt/bitmessageui.py\
+			../bitmessageqt/connect.py\
+			../bitmessageqt/help.py\
+			../bitmessageqt/iconglossary.py\
+			../bitmessageqt/newaddressdialog.py\
+			../bitmessageqt/newchandialog.py\
+			../bitmessageqt/newsubscriptiondialog.py\
+			../bitmessageqt/regenerateaddresses.py\
+			../bitmessageqt/settings.py\
+			../bitmessageqt/specialaddressbehavior.py
+
+			
+TRANSLATIONS	= bitmessage_en_pirate.ts
+CODECFORTR		= UTF-8

src/translations/bitmessage_en_pirate.ts

@@ -0,0 +1,1463 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="en_pirate" sourcelanguage="en">
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="91"/>
+        <source>One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="163"/>
+        <source>Reply</source>
+        <translatorcomment>.</translatorcomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="165"/>
+        <source>Add sender to your Address Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="269"/>
+        <source>Move to Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="169"/>
+        <source>View HTML code as formatted text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="171"/>
+        <source>Save message as...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="173"/>
+        <source>Mark Unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="573"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="292"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="294"/>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="290"/>
+        <source>Copy address to clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="200"/>
+        <source>Special address behavior...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="218"/>
+        <source>Send message to this address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="222"/>
+        <source>Subscribe to this address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="224"/>
+        <source>Add New Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="288"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="271"/>
+        <source>Copy destination address to clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="273"/>
+        <source>Force send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="600"/>
+        <source>Add new entry</source>
+        <translation type="unfinished">Add yee new entry</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="398"/>
+        <source>Since startup on %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="632"/>
+        <source>Waiting on their encryption key. Will request it again soon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="635"/>
+        <source>Encryption key request queued.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="638"/>
+        <source>Queued.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="641"/>
+        <source>Message sent. Waiting on acknowledgement. Sent at %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="644"/>
+        <source>Message sent. Sent at %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="647"/>
+        <source>Need to do work to send message. Work is queued.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="650"/>
+        <source>Acknowledgement of the message received %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="653"/>
+        <source>Broadcast queued.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="656"/>
+        <source>Broadcast on %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="659"/>
+        <source>Problem: The work demanded by the recipient is more difficult than you are willing to do. %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="662"/>
+        <source>Problem: The recipient&apos;s encryption key is no good. Could not encrypt message. %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="665"/>
+        <source>Forced difficulty override. Send should start soon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="668"/>
+        <source>Unknown status: %1 %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1344"/>
+        <source>Not Connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="821"/>
+        <source>Show Bitmessage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="556"/>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="836"/>
+        <source>Subscribe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="597"/>
+        <source>Address Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="622"/>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1130"/>
+        <source>You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1134"/>
+        <source>You may manage your keys by editing the keys.dat file stored in
+ %1 
+It is important that you back up this file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1141"/>
+        <source>Open keys.dat?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1138"/>
+        <source>You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1141"/>
+        <source>You may manage your keys by editing the keys.dat file stored in
+ %1 
+It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1147"/>
+        <source>Delete trash?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1147"/>
+        <source>Are you sure you want to delete all trashed messages?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1158"/>
+        <source>bad passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1158"/>
+        <source>You must type your passphrase. If you don&apos;t have one then this is not the form for you.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1197"/>
+        <source>Chan name needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1197"/>
+        <source>You didn&apos;t enter a chan name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1217"/>
+        <source>Address already present</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1217"/>
+        <source>Could not add chan because it appears to already be one of your identities.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1222"/>
+        <source>Success</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1192"/>
+        <source>Successfully created chan. To let others join your chan, give them the chan name and this Bitmessage address: %1. This address also appears in &apos;Your Identities&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1201"/>
+        <source>Address too new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1201"/>
+        <source>Although that Bitmessage address might be valid, its version number is too new for us to handle. Perhaps you need to upgrade Bitmessage.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1205"/>
+        <source>Address invalid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1205"/>
+        <source>That Bitmessage address is not valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1213"/>
+        <source>Address does not match chan name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1213"/>
+        <source>Although the Bitmessage address you entered was valid, it doesn&apos;t match the chan name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1222"/>
+        <source>Successfully joined chan. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1265"/>
+        <source>Processed %1 person-to-person messages.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1270"/>
+        <source>Processed %1 broadcast messages.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1275"/>
+        <source>Processed %1 public keys.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1319"/>
+        <source>Total Connections: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1338"/>
+        <source>Connection lost</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1379"/>
+        <source>Connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1425"/>
+        <source>Message trashed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1559"/>
+        <source>Error: Bitmessage addresses start with BM-   Please check %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1562"/>
+        <source>Error: The address %1 is not typed or copied correctly. Please check it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1565"/>
+        <source>Error: The address %1 contains invalid characters. Please check it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1568"/>
+        <source>Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1571"/>
+        <source>Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1574"/>
+        <source>Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1577"/>
+        <source>Error: Something is wrong with the address %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1644"/>
+        <source>Error: You must specify a From address. If you don&apos;t have one, go to the &apos;Your Identities&apos; tab.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1588"/>
+        <source>Sending to your address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1588"/>
+        <source>Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1594"/>
+        <source>Address version number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1594"/>
+        <source>Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1598"/>
+        <source>Stream number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1598"/>
+        <source>Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1603"/>
+        <source>Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won&apos;t send until you connect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1640"/>
+        <source>Your &apos;To&apos; field is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1695"/>
+        <source>Work is queued.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1717"/>
+        <source>Right click one or more entries in your address book and select &apos;Send message to this address&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1728"/>
+        <source>Fetched address from namecoin identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1805"/>
+        <source>Work is queued. %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1874"/>
+        <source>New Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1874"/>
+        <source>From </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3282"/>
+        <source>Address is valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2230"/>
+        <source>The address you entered was invalid. Ignoring it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2440"/>
+        <source>Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2610"/>
+        <source>Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2046"/>
+        <source>Restart</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2040"/>
+        <source>You must restart Bitmessage for the port number change to take effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2046"/>
+        <source>Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2227"/>
+        <source>Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2280"/>
+        <source>Passphrase mismatch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2280"/>
+        <source>The passphrase you entered twice doesn&apos;t match. Try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2283"/>
+        <source>Choose a passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2283"/>
+        <source>You really do need a passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2306"/>
+        <source>All done. Closing user interface...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2380"/>
+        <source>Address is gone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2380"/>
+        <source>Bitmessage cannot find your address %1. Perhaps you removed it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2384"/>
+        <source>Address disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2384"/>
+        <source>Error: The address from which you are trying to send is disabled. You&apos;ll have to enable it on the &apos;Your Identities&apos; tab before using it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2437"/>
+        <source>Entry added to the Address Book. Edit the label to your liking.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2502"/>
+        <source>Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2476"/>
+        <source>Save As...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2485"/>
+        <source>Write error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2596"/>
+        <source>No addresses selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3063"/>
+        <source>Options have been disabled because they either aren&apos;t applicable or because they haven&apos;t yet been implemented for your operating system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3204"/>
+        <source>Testing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3245"/>
+        <source>This is a chan address. You cannot use it as a pseudo-mailing list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3264"/>
+        <source>The address should start with &apos;&apos;BM-&apos;&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3267"/>
+        <source>The address is not typed or copied correctly (the checksum failed).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3270"/>
+        <source>The version number of this address is higher than this software can support. Please upgrade Bitmessage.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3273"/>
+        <source>The address contains invalid characters.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3276"/>
+        <source>Some data encoded in the address is too short.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3279"/>
+        <source>Some data encoded in the address is too long.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3324"/>
+        <source>You are using TCP port %1. (This can be changed in the settings).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="524"/>
+        <source>Bitmessage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="557"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="558"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="565"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="567"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="569"/>
+        <source>Subject</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="562"/>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="539"/>
+        <source>Received</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="540"/>
+        <source>Inbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="541"/>
+        <source>Load from Address book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="542"/>
+        <source>Fetch Namecoin ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="543"/>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="544"/>
+        <source>Subject:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="545"/>
+        <source>Send to one or more specific people</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="546"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="551"/>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="552"/>
+        <source>From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="553"/>
+        <source>Broadcast to everyone who is subscribed to your address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="555"/>
+        <source>Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="571"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="572"/>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="576"/>
+        <source>Label (not shown to anyone)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="605"/>
+        <source>Address</source>
+        <translation type="unfinished">Address</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="580"/>
+        <source>Stream</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="581"/>
+        <source>Your Identities</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="582"/>
+        <source>Here you can subscribe to &apos;broadcast messages&apos; that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="583"/>
+        <source>Add new Subscription</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="586"/>
+        <source>Label</source>
+        <translation type="unfinished">Label</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="589"/>
+        <source>Subscriptions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="590"/>
+        <source>The Address book is useful for adding names or labels to other people&apos;s Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the &apos;Add&apos; button, or from your inbox by right-clicking on a message.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="603"/>
+        <source>Name or Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="598"/>
+        <source>Use a Blacklist (Allow all incoming messages except those on the Blacklist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="599"/>
+        <source>Use a Whitelist (Block all incoming messages except those on the Whitelist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="606"/>
+        <source>Blacklist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="608"/>
+        <source>Stream #</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="610"/>
+        <source>Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="611"/>
+        <source>Total connections: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="612"/>
+        <source>Since startup at asdf:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="613"/>
+        <source>Processed 0 person-to-person message.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="614"/>
+        <source>Processed 0 public key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="615"/>
+        <source>Processed 0 broadcast.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="616"/>
+        <source>Network Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="617"/>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="627"/>
+        <source>Settings</source>
+        <translation type="unfinished">Settings</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="624"/>
+        <source>Help</source>
+        <translation type="unfinished">Help</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="620"/>
+        <source>Import keys</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="621"/>
+        <source>Manage keys</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="623"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished">Ctrrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="625"/>
+        <source>F1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="626"/>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="628"/>
+        <source>Regenerate deterministic addresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="629"/>
+        <source>Delete all trashed messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="630"/>
+        <source>Join / Create chan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewAddressDialog</name>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="173"/>
+        <source>Create new Address</source>
+        <translation>Neue Adresse erstellen</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="174"/>
+        <source>Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a &quot;deterministic&quot; address.
+The &apos;Random Number&apos; option is selected by default but deterministic addresses have several pros and cons:</source>
+        <translation>Here yee may gen&apos;rate arrrs many arrddresses as yee like. Indeed, crrreatin&apos; and abandonin&apos; arrddresses be encouraged. Yee may generrrate arrddresses by usin&apos; either random numbers or by usin&apos; a passphrase. If you be usin&apos; a passphrase, t&apos; arrddress be called a &quot;deterministic&quot; arrddress.
+T&apos; &apos;Random Number&apos; option be selected by default but deterministic arrddresses have several pros and cons:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="176"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Pros:&lt;br/&gt;&lt;/span&gt;You can recreate your addresses on any computer from memory. &lt;br/&gt;You need-not worry about backing up your keys.dat file as long as you can remember your passphrase. &lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Cons:&lt;br/&gt;&lt;/span&gt;You must remember (or write down) your passphrase if you expect to be able to recreate your keys if they are lost. &lt;br/&gt;You must remember the address version number and the stream number along with your passphrase. &lt;br/&gt;If you choose a weak passphrase and someone on the Internet can brute-force it, they can read your messages and send messages as you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Pros:&lt;br/&gt;&lt;/span&gt;Yee may recreate your arrddresses on any computer from memory. &lt;br/&gt;Yee shant worry about backing up yee keys.dat file as long as yee shall remember t&apos; passphrase. &lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Cons:&lt;br/&gt;&lt;/span&gt;Yee must remember (or scribe down) t&apos; passphrase if yee expect t&apos; be able to recreate your keys if they be lost. &lt;br/&gt;Yee must remember t&apos; arrddress version number and t&apos; stream number along with yee passphrase. &lt;br/&gt;If yee choose a weak passphrase and someone on t&apos; great see of internet can brute-force it like a real pirate, they can read yee messages and send messages as you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="177"/>
+        <source>Use a random number generator to make an address</source>
+        <translation>Use yee random number generator to make an arrddress</translation>
+    </message>
+    <message>
+        <location filename="newaddressdialog.py" line="169"/>
+        <source>Use a passpharase to make addresses</source>
+        <translation type="obsolete">Use yee passpharase to make arrddresses</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="179"/>
+        <source>Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter</source>
+        <translation>Spend several minutes of extra computing time to make t&apos; arrddress(es) 1 or 2 charrracters sharter.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="180"/>
+        <source>Make deterministic addresses</source>
+        <translation>Make deterministic arrddresses</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="181"/>
+        <source>Address version number: 3</source>
+        <translation>Arrddress version number: 3</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="182"/>
+        <source>In addition to your passphrase, you must remember these numbers:</source>
+        <translation>In addition to yee passphrase, yee must rememberrr these numbers:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="183"/>
+        <source>Passphrase</source>
+        <translation>Passphrase</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="184"/>
+        <source>Number of addresses to make based on your passphrase:</source>
+        <translation>Number of addresses t&apos; make based on yee passphrase:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="185"/>
+        <source>Stream number: 1</source>
+        <translation>Stream number: 1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="186"/>
+        <source>Retype passphrase</source>
+        <translation>RRRetype passphrase matey:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="187"/>
+        <source>Randomly generate address</source>
+        <translation>RRRandomly generate address</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="188"/>
+        <source>Label (not shown to anyone except you)</source>
+        <translation>Label (not shown t&apos; any sailors &apos;cept you)</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="189"/>
+        <source>Use the most available stream</source>
+        <translation>Use t&apos; most available stream</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="190"/>
+        <source> (best if this is the first of many addresses you will create)</source>
+        <translation> (best if this be t&apos; first of many arrddresses you be creatin&apos;)</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="191"/>
+        <source>Use the same stream as an existing address</source>
+        <translation>Use t&apos; same stream as an existing arrddress</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="192"/>
+        <source>(saves you some bandwidth and processing power)</source>
+        <translation>(saves yee some bandwidth and processing powerrr)</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="178"/>
+        <source>Use a passphrase to make addresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewSubscriptionDialog</name>
+    <message>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="57"/>
+        <source>Add new entry</source>
+        <translation>Add yee new entry</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="58"/>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="59"/>
+        <source>Address</source>
+        <translation>Address</translation>
+    </message>
+</context>
+<context>
+    <name>SpecialAddressBehaviorDialog</name>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="59"/>
+        <source>Special Address Behavior</source>
+        <translation>Special Arrddress Behavior</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="60"/>
+        <source>Behave as a normal address</source>
+        <translation>Behave yee as normal arrddress</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="61"/>
+        <source>Behave as a pseudo-mailing-list address</source>
+        <translation>Behave yee as pseudo-mailing-list arrddress</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="62"/>
+        <source>Mail received to a pseudo-mailing-list address will be automatically broadcast to subscribers (and thus will be public).</source>
+        <translation>Mail rrreceived to yee pseudo-mailing-list arrddress be automatically broadcast to subscribers (all sailors in public be able to see yee message).</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="63"/>
+        <source>Name of the pseudo-mailing-list:</source>
+        <translation>Name yee pseudo-mailing-list:</translation>
+    </message>
+</context>
+<context>
+    <name>aboutDialog</name>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="58"/>
+        <source>PyBitmessage</source>
+        <translation>PyBitmessage</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="59"/>
+        <source>version ?</source>
+        <translation>Version ?</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="57"/>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message utf8="true">
+        <location filename="../bitmessageqt/about.py" line="60"/>
+        <source>Copyright © 2013 Jonathan Warren</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="61"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Distributed under the MIT/X11 software license; see &lt;a href=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.opensource.org/licenses/mit-license.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="62"/>
+        <source>This is Beta software.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>connectDialog</name>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="56"/>
+        <source>Bitmessage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="57"/>
+        <source>Bitmessage won&apos;t connect to anyone until you let it. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="58"/>
+        <source>Connect now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="59"/>
+        <source>Let me configure special network settings first</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>helpDialog</name>
+    <message>
+        <location filename="../bitmessageqt/help.py" line="45"/>
+        <source>Help</source>
+        <translation>Help</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/help.py" line="46"/>
+        <source>&lt;a href=&quot;http://Bitmessage.org/wiki/PyBitmessage_Help&quot;&gt;http://Bitmessage.org/wiki/PyBitmessage_Help&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;http://Bitmessage.org/wiki/PyBitmessage_Help&quot;&gt;http://Bitmessage.org/wiki/PyBitmessage_Help&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/help.py" line="47"/>
+        <source>As Bitmessage is a collaborative project, help can be found online in the Bitmessage Wiki:</source>
+        <translation>Bitmessage be project of many, a pirates help can be found online in the Bitmessage Wiki:</translation>
+    </message>
+</context>
+<context>
+    <name>iconGlossaryDialog</name>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="82"/>
+        <source>Icon Glossary</source>
+        <translation>Symbol-Glossar</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="83"/>
+        <source>You have no connections with other peers. </source>
+        <translation>Sie haben keine Verbindung zu anderen Teilnehmern.</translation>
+    </message>
+    <message>
+        <location filename="iconglossary.py" line="75"/>
+        <source>You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn&apos;t configured to foward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node.</source>
+        <translation type="obsolete">Yee have made least one connection to a peer pirate usin&apos; outgoing connection but yee not yet received any incoming connections. Yee firewall, witches nest, or home router probably shant configured to foward incoming TCP connections to yee computer. Bitmessage be workin&apos; just fine but it help fellow pirates if yee allowed for incoming connections and will help yee be a better-connected node matey.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="85"/>
+        <source>You are using TCP port ?. (This can be changed in the settings).</source>
+        <translation>You be usin&apos; TCP port ?. (This be changed in settings).</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="86"/>
+        <source>You do have connections with other peers and your firewall is correctly configured.</source>
+        <translation>Yee have connections with other peers and pirates,yee firewall is correctly configured.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="84"/>
+        <source>You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn&apos;t configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>newChanDialog</name>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="97"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="98"/>
+        <source>Create a new chan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="103"/>
+        <source>Join a chan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="100"/>
+        <source>Create a chan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="101"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a name for your chan. If you choose a sufficiently complex chan name (like a strong and unique passphrase) and none of your friends share it publicly then the chan will be secure and private. If you and someone else both create a chan with the same chan name then it is currently very likely that they will be the same chan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="105"/>
+        <source>Chan name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="104"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A chan exists when a group of people share the same decryption keys. The keys and bitmessage address used by a chan are generated from a human-friendly word or phrase (the chan name). To send a message to everyone in the chan, send a normal person-to-person message to the chan address.&lt;/p&gt;&lt;p&gt;Chans are experimental and completely unmoderatable.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="106"/>
+        <source>Chan bitmessage address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>regenerateAddressesDialog</name>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="104"/>
+        <source>Regenerate Existing Addresses</source>
+        <translation>Regenerate Existin&apos; Arrddresses</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="105"/>
+        <source>Regenerate existing addresses</source>
+        <translation>Regenerate existin&apos; addresses</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="106"/>
+        <source>Passphrase</source>
+        <translation>Passphrase</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="107"/>
+        <source>Number of addresses to make based on your passphrase:</source>
+        <translation>Number of arrddresses to make based on yee passphrase:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="108"/>
+        <source>Address version Number:</source>
+        <translation>Arrddress version Number:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="109"/>
+        <source>3</source>
+        <translation>3</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="110"/>
+        <source>Stream number:</source>
+        <translation>Stream numberrr:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="111"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="112"/>
+        <source>Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter</source>
+        <translation>Spend several minutes extra computin&apos; time to make yee address(es) 1 arr 2 characters sharter</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="113"/>
+        <source>You must check (or not check) this box just like you did (or didn&apos;t) when you made your addresses the first time.</source>
+        <translation>Yee must check (arr not check) this box just like yee did (or didn&apos;t) when yee made your arrddresses the first time.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="114"/>
+        <source>If you have previously made deterministic addresses but lost them due to an accident (like hard drive failure), you can regenerate them here. If you used the random number generator to make your addresses then this form will be of no use to you.</source>
+        <translation>If yee have previously made deterministic arrddresses but yee lost them due to an accident (like losin&apos; yee pirate ship), yee can regenerate them here. If yee used t&apos; random number generator to make yee addresses then this form be of no use to you.</translation>
+    </message>
+</context>
+<context>
+    <name>settingsDialog</name>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="335"/>
+        <source>Settings</source>
+        <translation>Settings</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="340"/>
+        <source>Start Bitmessage on user login</source>
+        <translation>Start yee Bitmessage on userrr login</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="336"/>
+        <source>Start Bitmessage in the tray (don&apos;t show main window)</source>
+        <translation>Start yee Bitmessage in t&apos; tray (don&apos;t show main window)</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="338"/>
+        <source>Minimize to tray</source>
+        <translation>Minimize to yee tray</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="337"/>
+        <source>Show notification when message received</source>
+        <translation>Show yee a notification when message received</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="341"/>
+        <source>Run in Portable Mode</source>
+        <translation>Run in yee Portable Mode</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="339"/>
+        <source>In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.</source>
+        <translation>In Portable Mode, messages and config files are stored in t&apos; same directory as yee program rather than t&apos; normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive or wooden leg.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="344"/>
+        <source>User Interface</source>
+        <translation>User Interface</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="345"/>
+        <source>Listening port</source>
+        <translation>Listenin&apos; port</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="346"/>
+        <source>Listen for connections on port:</source>
+        <translation>Listen for connections on yee port:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="347"/>
+        <source>Proxy server / Tor</source>
+        <translation>Proxy server / Tor</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="348"/>
+        <source>Type:</source>
+        <translation>Type:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="349"/>
+        <source>none</source>
+        <translation>none</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="350"/>
+        <source>SOCKS4a</source>
+        <translation>SOCKS4a</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="351"/>
+        <source>SOCKS5</source>
+        <translation>SOCKS5</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="352"/>
+        <source>Server hostname:</source>
+        <translation>Server hostname:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="371"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="354"/>
+        <source>Authentication</source>
+        <translation>Authentication</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="372"/>
+        <source>Username:</source>
+        <translation>Username:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="356"/>
+        <source>Pass:</source>
+        <translation>Pass:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="358"/>
+        <source>Network Settings</source>
+        <translation>Network Settings</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="359"/>
+        <source>When someone sends you a message, their computer must first complete some work. The difficulty of this work, by default, is 1. You may raise this default for new addresses you create by changing the values here. Any new addresses you create will require senders to meet the higher difficulty. There is one exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically notify them when you next send a message that they need only complete the minimum amount of work: difficulty 1. </source>
+        <translation>When a pirate sends yee a message, their computer must first complete a load of work. T&apos; difficulty of t&apos; work, by default, is 1. Yee may raise this default for new arrddresses yee create by changin&apos; the values here. Any new arrddresses you be createin&apos; will require senders to meet t&apos; higher difficulty. There be one exception: if yee add a friend or pirate to yee arrddress book, Bitmessage be automatically notifyin&apos; them when yee next send a message that they needin&apos; be only complete t&apos; minimum amount of work: difficulty 1. </translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="360"/>
+        <source>Total difficulty:</source>
+        <translation>Total difficulty:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="361"/>
+        <source>Small message difficulty:</source>
+        <translation>Small message difficulty:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="362"/>
+        <source>The &apos;Small message difficulty&apos; mostly only affects the difficulty of sending small messages. Doubling this value makes it almost twice as difficult to send a small message but doesn&apos;t really affect large messages.</source>
+        <translation>T&apos; &apos;Small message difficulty&apos; mostly only affects t&apos; difficulty of sending small messages. Doubling this value be makin&apos; it almost twice as difficult to send a small message but doesn&apos;t really affect large messages.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="363"/>
+        <source>The &apos;Total difficulty&apos; affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work.</source>
+        <translation>T&apos; &apos;Total difficulty&apos; affects the absolute amount of work yee sender must complete. Doubling this value be doublin&apos; t&apos; amount of work.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="364"/>
+        <source>Demanded difficulty</source>
+        <translation>Demanded difficulty</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="342"/>
+        <source>Willingly include unencrypted destination address when sending to a mobile device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="343"/>
+        <source>Override automatic language localization (use countycode or language code, e.g. &apos;en_US&apos; or &apos;en&apos;):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="357"/>
+        <source>Listen for incoming connections when using proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="365"/>
+        <source>Here you may set the maximum amount of work you are willing to do to send a message to another person. Setting these values to 0 means that any value is acceptable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="366"/>
+        <source>Maximum acceptable total difficulty:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="367"/>
+        <source>Maximum acceptable small message difficulty:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="368"/>
+        <source>Max acceptable difficulty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="369"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bitmessage can utilize a different Bitcoin-based program called Namecoin to make addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage address, you can simply tell him to send a message to &lt;span style=&quot; font-style:italic;&quot;&gt;test. &lt;/span&gt;&lt;/p&gt;&lt;p&gt;(Getting your own Bitmessage address into Namecoin is still rather difficult).&lt;/p&gt;&lt;p&gt;Bitmessage can use either namecoind directly or a running nmcontrol instance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="370"/>
+        <source>Host:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="373"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="374"/>
+        <source>Test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="375"/>
+        <source>Connect to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="376"/>
+        <source>Namecoind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="377"/>
+        <source>NMControl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="378"/>
+        <source>Namecoin integration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

src/translations/bitmessage_eo.pro

@@ -0,0 +1,33 @@
+SOURCES	= 	../addresses.py\
+			../bitmessagemain.py\
+			../class_addressGenerator.py\
+			../class_outgoingSynSender.py\
+			../class_receiveDataThread.py\
+			../class_sendDataThread.py\
+			../class_singleCleaner.py\
+			../class_singleListener.py\
+			../class_singleWorker.py\
+			../class_sqlThread.py\
+			../helper_bitcoin.py\
+			../helper_bootstrap.py\
+			../helper_generic.py\
+			../helper_inbox.py\
+			../helper_sent.py\
+			../helper_startup.py\
+			../shared.py\
+			../bitmessageqt/__init__.py\
+			../bitmessageqt/about.py\
+			../bitmessageqt/bitmessageui.py\
+			../bitmessageqt/connect.py\
+			../bitmessageqt/help.py\
+			../bitmessageqt/iconglossary.py\
+			../bitmessageqt/newaddressdialog.py\
+			../bitmessageqt/newchandialog.py\
+			../bitmessageqt/newsubscriptiondialog.py\
+			../bitmessageqt/regenerateaddresses.py\
+			../bitmessageqt/settings.py\
+			../bitmessageqt/specialaddressbehavior.py
+
+			
+TRANSLATIONS	= bitmessage_eo.ts
+CODECFORTR      = UTF-8

src/translations/bitmessage_eo.ts

@@ -0,0 +1,1525 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="de" sourcelanguage="en">
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="91"/>
+        <source>One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now?</source>
+        <translation>Iu de viaj adresoj, %1, estas malnova versio 1 adreso. Ĉu ni povas forviŝi ĝin?</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="163"/>
+        <source>Reply</source>
+        <translatorcomment>Aŭ ĉu oni uzas u-formon ĉi tie? &quot;Respondu&quot;?! Ŝajnas al mi ke ne..</translatorcomment>
+        <translation>Respondi</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="165"/>
+        <source>Add sender to your Address Book</source>
+        <translation>Aldoni sendinton al via adresaro</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="269"/>
+        <source>Move to Trash</source>
+        <translation>Movi al rubujo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="169"/>
+        <source>View HTML code as formatted text</source>
+        <translation>Montri HTML-n kiel aranĝita teksto </translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="171"/>
+        <source>Save message as...</source>
+        <translation>Konservi mesaĝon kiel...</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="573"/>
+        <source>New</source>
+        <translation>Nova</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="292"/>
+        <source>Enable</source>
+        <translatorcomment>ankaŭ eblus aktivigi</translatorcomment>
+        <translation>Ŝalti</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="294"/>
+        <source>Disable</source>
+        <translatorcomment>ankaŭ eblus malaktivigi</translatorcomment>
+        <translation>Malŝalti</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="290"/>
+        <source>Copy address to clipboard</source>
+        <translatorcomment>ankaŭ eblus &quot;tondujo&quot; aŭ &quot;poŝo&quot;</translatorcomment>
+        <translation>Kopii adreson al tondejo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="200"/>
+        <source>Special address behavior...</source>
+        <translation>Speciala sinteno de adreso...</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="218"/>
+        <source>Send message to this address</source>
+        <translation>Sendi mesaĝon al tiu adreso</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="222"/>
+        <source>Subscribe to this address</source>
+        <translation>Aboni tiun adreson</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="224"/>
+        <source>Add New Address</source>
+        <translation>Aldoni novan adreson</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="288"/>
+        <source>Delete</source>
+        <translatorcomment>aŭ forigi</translatorcomment>
+        <translation>Forviŝi</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="271"/>
+        <source>Copy destination address to clipboard</source>
+        <translation>Kopii cel-adreson al tondejo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="273"/>
+        <source>Force send</source>
+        <translation>Devigi sendadon</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="600"/>
+        <source>Add new entry</source>
+        <translatorcomment>aŭ eron</translatorcomment>
+        <translation>Aldoni novan elementon</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="632"/>
+        <source>Waiting on their encryption key. Will request it again soon.</source>
+        <translatorcomment>mi ne certas kiel traduki &quot;their&quot; ĉi tie. Sonas strange al mi.</translatorcomment>
+        <translation type="unfinished">Atendante al ilia ĉifroŝlosilo. Baldaŭ petos ĝin denove.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="635"/>
+        <source>Encryption key request queued.</source>
+        <translation>Peto por ĉifroŝlosilo envicigita.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="638"/>
+        <source>Queued.</source>
+        <translation>En atendovico.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="641"/>
+        <source>Message sent. Waiting on acknowledgement. Sent at %1</source>
+        <translation>Mesaĝo sendita. Atendante konfirmon. Sendita je %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="647"/>
+        <source>Need to do work to send message. Work is queued.</source>
+        <translation>Devas labori por sendi mesaĝon. Laboro en atendovico.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="650"/>
+        <source>Acknowledgement of the message received %1</source>
+        <translation>Ricevis konfirmon de la mesaĝo je %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="653"/>
+        <source>Broadcast queued.</source>
+        <translation>Elsendo en atendovico.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="656"/>
+        <source>Broadcast on %1</source>
+        <translation>Elsendo je %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="659"/>
+        <source>Problem: The work demanded by the recipient is more difficult than you are willing to do. %1</source>
+        <translation>Problemo: la demandita laboro de la ricevonto estas pli malfacila ol vi pretas fari. %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="662"/>
+        <source>Problem: The recipient&apos;s encryption key is no good. Could not encrypt message. %1</source>
+        <translation>Problemo: la ĉifroŝlosilo de la ricevonto estas rompita. Ne povis ĉifri la mesaĝon. %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="665"/>
+        <source>Forced difficulty override. Send should start soon.</source>
+        <translatorcomment>Ĉi tie mi ne certas kiel traduki &quot;Forced difficulty override&quot;</translatorcomment>
+        <translation type="unfinished">Devigita superado de limito de malfacilaĵo. Sendado devus baldaŭ komenci.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="668"/>
+        <source>Unknown status: %1 %2</source>
+        <translation>Nekonata stato: %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="398"/>
+        <source>Since startup on %1</source>
+        <translation>Ekde lanĉo de la programo je %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1344"/>
+        <source>Not Connected</source>
+        <translation>Ne konektita</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="821"/>
+        <source>Show Bitmessage</source>
+        <translation>Montri Bitmesaĝon</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="556"/>
+        <source>Send</source>
+        <translation>Sendi</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="836"/>
+        <source>Subscribe</source>
+        <translation>Aboni</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="597"/>
+        <source>Address Book</source>
+        <translation>Adresaro</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="622"/>
+        <source>Quit</source>
+        <translation>Eliri</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1130"/>
+        <source>You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file.</source>
+        <translation>Vi povas administri viajn ŝlosilojn redaktante la dosieron keys.dat en la sama dosierujo kiel tiu programo. Estas grava ke vi faru savkopion de tiu dosiero.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1134"/>
+        <source>You may manage your keys by editing the keys.dat file stored in
+ %1 
+It is important that you back up this file.</source>
+        <translation>Vi povas administri viajn ŝlosilojn redaktante la dosieron keys.dat en la dosierujo
+%1.
+Estas grava ke vi faru savkopion de tiu dosiero.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1141"/>
+        <source>Open keys.dat?</source>
+        <translatorcomment>Ĉu &quot;ĉu&quot; estas bezonata ĉi tie? Aŭ ĉu sufiĉas diri &quot;Malfermi keys.dat?&quot;</translatorcomment>
+        <translation type="unfinished">Ĉu malfermi keys.dat?</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1138"/>
+        <source>You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)</source>
+        <translation>Vi povas administri viajn ŝlosilojn redaktante la dosieron keys.dat en la sama dosierujo kiel tiu programo. Estas grava ke vi faru savkopion de tiu dosiero. Ĉu vi volas malfermi la dosieron nun? (Bonvolu certigi ke Bitmesaĝo estas fermita antaŭ fari ŝanĝojn.)</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1141"/>
+        <source>You may manage your keys by editing the keys.dat file stored in
+ %1 
+It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)</source>
+        <translation>Vi povas administri viajn ŝlosilojn redaktante la dosieron keys.dat en la dosierujo
+%1.
+Estas grava ke vi faru savkopion de tiu dosiero. Ĉu vi volas malfermi la dosieron nun? (Bonvolu certigi ke Bitmesaĝo estas fermita antaŭ fari ŝanĝojn.)</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1147"/>
+        <source>Delete trash?</source>
+        <translation>Malplenigi rubujon?</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1147"/>
+        <source>Are you sure you want to delete all trashed messages?</source>
+        <translatorcomment>Ĉu &quot;el&quot; aŭ &quot;en&quot; pli taŭgas?</translatorcomment>
+        <translation type="unfinished">Ĉu vi certas ke vi volas forviŝi ĉiujn mesaĝojn el la rubojo?</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1158"/>
+        <source>bad passphrase</source>
+        <translation>malprava pasvorto</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1158"/>
+        <source>You must type your passphrase. If you don&apos;t have one then this is not the form for you.</source>
+        <translation>Vi devas tajpi vian pasvorton. Se vi ne havas pasvorton tiu ne estas la prava formularo por vi.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1265"/>
+        <source>Processed %1 person-to-person messages.</source>
+        <translatorcomment>(Mi trovis &quot;inter-para&quot; kiel traduko de P2P en vikipedio: https://eo.wikipedia.org/wiki/P2p &quot;samtavola&quot; sonis strange al mi. Inter &quot;p&quot;ara ja povus uziĝi kiel &quot;para-al-para&quot; kvazaŭ kiel la angla P2P. Poste mi vidis ke tio ne celas peer2peer sed person2person.)</translatorcomment>
+        <translation type="unfinished">Pritraktis %1 inter-personajn mesaĝojn.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1270"/>
+        <source>Processed %1 broadcast messages.</source>
+        <translation>Pritraktis %1 elsendojn.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1275"/>
+        <source>Processed %1 public keys.</source>
+        <translation>Pritraktis %1 publikajn ŝlosilojn.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1319"/>
+        <source>Total Connections: %1</source>
+        <translatorcomment>Ĉu &quot;totala&quot; pravas ĉi tie?</translatorcomment>
+        <translation type="unfinished">Totalaj Konektoj: %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1338"/>
+        <source>Connection lost</source>
+        <translation>Perdis konekton</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1379"/>
+        <source>Connected</source>
+        <translation>Konektita</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1425"/>
+        <source>Message trashed</source>
+        <translation>Movis mesaĝon al rubujo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1559"/>
+        <source>Error: Bitmessage addresses start with BM-   Please check %1</source>
+        <translation>Eraro: en Bitmesaĝa adresoj komencas kun BM-   Bonvolu kontroli %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1562"/>
+        <source>Error: The address %1 is not typed or copied correctly. Please check it.</source>
+        <translation>Eraro: La adreso %1 ne estis prave tajpita aŭ kopiita. Bonvolu kontroli ĝin.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1565"/>
+        <source>Error: The address %1 contains invalid characters. Please check it.</source>
+        <translation>Eraro: La adreso %1 enhavas malpermesitajn simbolojn. Bonvolu kontroli ĝin.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1568"/>
+        <source>Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever.</source>
+        <translatorcomment>Mi demandis en DevTalk kiel traduki &quot; is being clever.&quot; Ŝajne la aliaj tradukoj simple forlasis ĝin.</translatorcomment>
+        <translation>Eraro: La adres-versio %1 estas tro alta. Eble vi devas promocii vian Bitmesaĝo programon aŭ via konato uzas alian programon.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1571"/>
+        <source>Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance.</source>
+        <translation>Eraro: Kelkaj datumoj kodita en la adreso %1 estas tro mallongaj. Povus esti ke io en la programo de via konato malfunkcias.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1574"/>
+        <source>Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance.</source>
+        <translation>Eraro: Kelkaj datumoj kodita en la adreso %1 estas tro longaj. Povus esti ke io en la programo de via konato malfunkcias.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1577"/>
+        <source>Error: Something is wrong with the address %1.</source>
+        <translation>Eraro: Io malĝustas kun la adreso %1.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1644"/>
+        <source>Error: You must specify a From address. If you don&apos;t have one, go to the &apos;Your Identities&apos; tab.</source>
+        <translation type="unfinished">Eraro: Vi devas elekti sendontan adreson. Se vi ne havas iun, iru al langeto &quot;Viaj identigoj&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1588"/>
+        <source>Sending to your address</source>
+        <translation>Sendante al via adreso</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1588"/>
+        <source>Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.</source>
+        <translatorcomment>Ĉu &quot;kliento&quot; pravas? Ĉu &quot;virtuala maŝino?</translatorcomment>
+        <translation>Eraro: Unu el la adresoj al kiuj vi sendas mesaĝon (%1) apartenas al vi. Bedaŭrinde, la kliento de Bitmesaĝo ne povas pritrakti siajn proprajn mesaĝojn. Bonvolu uzi duan klienton ĉe alia komputilo aŭ en virtuala maŝino (VM).</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1594"/>
+        <source>Address version number</source>
+        <translation>Numero de adresversio</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1594"/>
+        <source>Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1598"/>
+        <source>Stream number</source>
+        <translation>Fluo numero</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1598"/>
+        <source>Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1603"/>
+        <source>Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won&apos;t send until you connect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1640"/>
+        <source>Your &apos;To&apos; field is empty.</source>
+        <translation>Via &quot;Ricevonto&quot;-kampo malplenas.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1695"/>
+        <source>Work is queued.</source>
+        <translation>Laboro en atendovico.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1717"/>
+        <source>Right click one or more entries in your address book and select &apos;Send message to this address&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1805"/>
+        <source>Work is queued. %1</source>
+        <translation>Laboro en atendovico. %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1874"/>
+        <source>New Message</source>
+        <translation>Nova mesaĝo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1874"/>
+        <source>From </source>
+        <translation>De</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3282"/>
+        <source>Address is valid.</source>
+        <translation>Adreso estas ĝusta.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2440"/>
+        <source>Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.</source>
+        <translation>Eraro: Vi ne povas duoble aldoni la saman adreson al via adresaro. Provu renomi la jaman se vi volas.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2230"/>
+        <source>The address you entered was invalid. Ignoring it.</source>
+        <translation>La adreso kiun vi enmetis estas malĝusta. Ignoras ĝin.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2610"/>
+        <source>Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want.</source>
+        <translation>Eraro: Vi ne povas duoble aboni la saman adreson. Provu renomi la jaman se vi volas.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2046"/>
+        <source>Restart</source>
+        <translation>Restartigi</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2040"/>
+        <source>You must restart Bitmessage for the port number change to take effect.</source>
+        <translation type="unfinished">Vi devas restartigi Bitmesaĝon por ke la ŝanĝo de la numero de pordo (Port Number) efektivigu.</translation>
+    </message>
+    <message>
+        <location filename="__init__.py" line="1751"/>
+        <source>Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections.</source>
+        <translation type="obsolete">Bitmessage wird den Proxy-Server ab jetzt verwenden, möglicherweise möchten Sie Bitmessage neu starten um bestehende Verbindungen zu schließen.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2227"/>
+        <source>Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2280"/>
+        <source>Passphrase mismatch</source>
+        <translatorcomment>Notu ke pasfrazo kutime estas pli longa ol pasvorto.</translatorcomment>
+        <translation>Pasfrazoj malsamas</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2280"/>
+        <source>The passphrase you entered twice doesn&apos;t match. Try again.</source>
+        <translation>La pasfrazo kiun vi duoble enmetis malsamas. Provu denove.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2283"/>
+        <source>Choose a passphrase</source>
+        <translation>Elektu pasfrazon</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2283"/>
+        <source>You really do need a passphrase.</source>
+        <translation>Vi ja vere bezonas pasfrazon.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2306"/>
+        <source>All done. Closing user interface...</source>
+        <translation type="unfinished">Ĉiu preta. Fermante fasadon...</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2380"/>
+        <source>Address is gone</source>
+        <translatorcomment>Oni devas certigi KIE tiu frazo estas por havi la kuntekston.</translatorcomment>
+        <translation type="unfinished">Adreso foriris</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2380"/>
+        <source>Bitmessage cannot find your address %1. Perhaps you removed it?</source>
+        <translation>Bitmesaĝo ne povas trovi vian adreson %1. Ĉu eble vi forviŝis ĝin?</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2384"/>
+        <source>Address disabled</source>
+        <translation>Adreso malŝaltita</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2384"/>
+        <source>Error: The address from which you are trying to send is disabled. You&apos;ll have to enable it on the &apos;Your Identities&apos; tab before using it.</source>
+        <translation type="unfinished">Eraro: La adreso kun kiu vi provas sendi estas malŝaltita. Vi devos ĝin ŝalti en la langeto &apos;Viaj identigoj&apos; antaŭ uzi ĝin.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2437"/>
+        <source>Entry added to the Address Book. Edit the label to your liking.</source>
+        <translatorcomment>Ĉu pli bone &quot;Bv. redakti&quot;?</translatorcomment>
+        <translation>Aldonis elementon al adresaro. Redaktu la etikedo laŭvole.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2502"/>
+        <source>Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.</source>
+        <translation>Movis elementojn al rubujo. Ne estas fasado por rigardi vian rubujon, sed ankoraŭ estas sur disko  se vi esperas ĝin retrovi.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2476"/>
+        <source>Save As...</source>
+        <translation>Konservi kiel...</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2485"/>
+        <source>Write error.</source>
+        <translatorcomment>http://komputeko.net/index_en.php?vorto=write+error</translatorcomment>
+        <translation>Skriberaro.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2596"/>
+        <source>No addresses selected.</source>
+        <translation>Neniu adreso elektita.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3063"/>
+        <source>Options have been disabled because they either aren&apos;t applicable or because they haven&apos;t yet been implemented for your operating system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3264"/>
+        <source>The address should start with &apos;&apos;BM-&apos;&apos;</source>
+        <translatorcomment>Aŭ &quot;devus komenci&quot; laŭ kunteksto?</translatorcomment>
+        <translation type="unfinished">La adreso komencu kun &quot;BM-&quot;</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3267"/>
+        <source>The address is not typed or copied correctly (the checksum failed).</source>
+        <translation>La adreso ne estis prave tajpita aŭ kopiita (kontrolsumo malsukcesis).</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3270"/>
+        <source>The version number of this address is higher than this software can support. Please upgrade Bitmessage.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3273"/>
+        <source>The address contains invalid characters.</source>
+        <translation>La adreso enhavas malpermesitajn simbolojn.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3276"/>
+        <source>Some data encoded in the address is too short.</source>
+        <translation>Kelkaj datumoj kodita en la adreso estas tro mallongaj.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3279"/>
+        <source>Some data encoded in the address is too long.</source>
+        <translation>Kelkaj datumoj kodita en la adreso estas tro longaj.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3324"/>
+        <source>You are using TCP port %1. (This can be changed in the settings).</source>
+        <translation>Vi estas uzanta TCP pordo %1 (Tio estas ŝanĝebla en la agordoj).</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="524"/>
+        <source>Bitmessage</source>
+        <translatorcomment>Dependas de la kunteksto ĉu oni volas traduki tion.</translatorcomment>
+        <translation>Bitmesaĝo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="565"/>
+        <source>To</source>
+        <translation>Al</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="567"/>
+        <source>From</source>
+        <translation>De</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="569"/>
+        <source>Subject</source>
+        <translation>Temo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="539"/>
+        <source>Received</source>
+        <translatorcomment>Kunteksto?</translatorcomment>
+        <translation type="unfinished">Ricevita</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="540"/>
+        <source>Inbox</source>
+        <translatorcomment>aŭ &quot;ricevkesto&quot; http://komputeko.net/index_en.php?vorto=Inbox</translatorcomment>
+        <translation>Ricevujo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="541"/>
+        <source>Load from Address book</source>
+        <translation>Ŝarĝi el adresaro</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="543"/>
+        <source>Message:</source>
+        <translation>Mesaĝo:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="544"/>
+        <source>Subject:</source>
+        <translation>Temo:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="545"/>
+        <source>Send to one or more specific people</source>
+        <translation>Sendi al unu aŭ pli specifaj personoj</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="546"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="551"/>
+        <source>To:</source>
+        <translation>Al:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="552"/>
+        <source>From:</source>
+        <translation>De:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="553"/>
+        <source>Broadcast to everyone who is subscribed to your address</source>
+        <translatorcomment>Ĉu &quot;ĉiu kiu&quot; eĉ eblas?</translatorcomment>
+        <translation type="unfinished">Elsendi al ĉiu kiu subskribis al via adreso</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="555"/>
+        <source>Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.</source>
+        <translation type="unfinished">Sciu ke elsendoj estas sole ĉifrita kun via adreso. Iu ajn povas legi ĝin se tiu scias vian adreson.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="571"/>
+        <source>Status</source>
+        <translatorcomment>http://komputeko.net/index_en.php?vorto=status</translatorcomment>
+        <translation>Stato</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="572"/>
+        <source>Sent</source>
+        <translation>Sendita</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="576"/>
+        <source>Label (not shown to anyone)</source>
+        <translation>Etikdeo (ne montrita al iu ajn)</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="605"/>
+        <source>Address</source>
+        <translation>Adreso</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="580"/>
+        <source>Stream</source>
+        <translation>Fluo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="581"/>
+        <source>Your Identities</source>
+        <translatorcomment>Mi ne certis kion uzi: ĉu identeco (rim: internacia senco) aŭ ĉu identigo. Mi decidis por identigo pro la rilato al senco &quot;rekoni&quot; (&quot;identigi krimulon&quot;)</translatorcomment>
+        <translation type="unfinished">Via identigoj</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="582"/>
+        <source>Here you can subscribe to &apos;broadcast messages&apos; that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab.</source>
+        <translation type="unfinished">Ĉi tie vi povas aboni &quot;elsendajn mesaĝojn&quot; elsendita de aliaj uzantoj. Adresoj ĉi tie transpasas tiujn sur la langeto &quot;Nigara listo&quot;.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="583"/>
+        <source>Add new Subscription</source>
+        <translatorcomment>kial &quot;Subscription&quot; kun granda S?</translatorcomment>
+        <translation type="unfinished">Aldoni novan Abonon</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="586"/>
+        <source>Label</source>
+        <translation>Etikedo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="589"/>
+        <source>Subscriptions</source>
+        <translation>Abonoj</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="590"/>
+        <source>The Address book is useful for adding names or labels to other people&apos;s Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the &apos;Add&apos; button, or from your inbox by right-clicking on a message.</source>
+        <translation type="unfinished">La Adresaro estas utila por aldoni nomojn aŭ etikedojn al la Bitmesaĝa adresoj de aliaj persono por ke vi povu rekoni ilin pli facile en via ricevujo. Vi povas aldoni elementojn ĉi tie uzante la butonon &apos;Aldoni&apos;, aŭ en la ricevujo per dekstra klako al mesaĝo.  </translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="603"/>
+        <source>Name or Label</source>
+        <translatorcomment>e aŭ E?</translatorcomment>
+        <translation type="unfinished">Nomo aŭ Etikedo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="598"/>
+        <source>Use a Blacklist (Allow all incoming messages except those on the Blacklist)</source>
+        <translatorcomment>http://komputeko.net/index_en.php?vorto=blacklist</translatorcomment>
+        <translation type="unfinished">Uzi Nigran Liston (permesi ĉiujn alvenintajn mesaĝojn escepte tiuj en la Nigra Listo)</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="599"/>
+        <source>Use a Whitelist (Block all incoming messages except those on the Whitelist)</source>
+        <translatorcomment>mi skribis majuskle ĉar mi pensas ke Blacklist and Whitelist estas specifa por tiu kunteksto </translatorcomment>
+        <translation type="unfinished">Uzi Blankan Liston (bloki ĉiujn alvenintajn mesaĝojn escepte tiuj en la Blanka Listo)</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="606"/>
+        <source>Blacklist</source>
+        <translation>Nigra Listo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="608"/>
+        <source>Stream #</source>
+        <translation>Fluo #</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="610"/>
+        <source>Connections</source>
+        <translation>Konetkoj</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="611"/>
+        <source>Total connections: 0</source>
+        <translation>Totalaj konektoj: 0</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="612"/>
+        <source>Since startup at asdf:</source>
+        <translatorcomment>Stranga fonto!</translatorcomment>
+        <translation>Ekde lanĉo de la programo je asdf:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="613"/>
+        <source>Processed 0 person-to-person message.</source>
+        <translation>Pritraktis 0 inter-personajn mesaĝojn.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="614"/>
+        <source>Processed 0 public key.</source>
+        <translation>Pritraktis 0 publikajn ŝlosilojn.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="615"/>
+        <source>Processed 0 broadcast.</source>
+        <translation>Pritraktis 0 elsendojn.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="616"/>
+        <source>Network Status</source>
+        <translation>Reta Stato</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="617"/>
+        <source>File</source>
+        <translation>Dosiero</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="627"/>
+        <source>Settings</source>
+        <translation>Agordoj</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="624"/>
+        <source>Help</source>
+        <translation>Helpo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="620"/>
+        <source>Import keys</source>
+        <translation>Importi ŝlosilojn</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="621"/>
+        <source>Manage keys</source>
+        <translation>Administri ŝlosilojn</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="626"/>
+        <source>About</source>
+        <translation>Pri</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="628"/>
+        <source>Regenerate deterministic addresses</source>
+        <translatorcomment>http://www.reta-vortaro.de/revo/art/gener.html https://eo.wikipedia.org/wiki/Determinismo</translatorcomment>
+        <translation>Regeneri determinisman adreson</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="629"/>
+        <source>Delete all trashed messages</source>
+        <translation type="unfinished">Forviŝi ĉiujn mesaĝojn el rubujo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="644"/>
+        <source>Message sent. Sent at %1</source>
+        <translation>Mesaĝo sendita. Sendita je %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1197"/>
+        <source>Chan name needed</source>
+        <translatorcomment>http://komputeko.net/index_en.php?vorto=channel</translatorcomment>
+        <translation>Bezonas nomon de kanalo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1197"/>
+        <source>You didn&apos;t enter a chan name.</source>
+        <translation type="unfinished">Vi ne enmetis nonon de kanalo.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1217"/>
+        <source>Address already present</source>
+        <translatorcomment>eble laŭ kunteksto &quot;en la listo&quot;?</translatorcomment>
+        <translation type="unfinished">Adreso jam ĉi tie</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1217"/>
+        <source>Could not add chan because it appears to already be one of your identities.</source>
+        <translation>Ne povis aldoni kanalon ĉar ŝajne jam estas unu el viaj indentigoj.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1222"/>
+        <source>Success</source>
+        <translation>Sukceso</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1192"/>
+        <source>Successfully created chan. To let others join your chan, give them the chan name and this Bitmessage address: %1. This address also appears in &apos;Your Identities&apos;.</source>
+        <translation>Sukcese kreis kanalon. Por ebligi al aliaj aniĝi vian kanalon, sciigu al ili la nomon de la kanalo kaj ties Bitmesaĝa adreso: %1. Tiu adreso ankaŭ aperas en &apos;Viaj identigoj&apos;.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1201"/>
+        <source>Address too new</source>
+        <translatorcomment>Kion tio signifu? kunteksto?</translatorcomment>
+        <translation>Adreso tro nova</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1201"/>
+        <source>Although that Bitmessage address might be valid, its version number is too new for us to handle. Perhaps you need to upgrade Bitmessage.</source>
+        <translation type="unfinished">Kvankam tiu Bitmesaĝa adreso povus esti ĝusta, ĝia versionumero estas tro nova por pritrakti ĝin. Eble vi devas promocii vian Bitmesaĝon.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1205"/>
+        <source>Address invalid</source>
+        <translation>Adreso estas malĝusta</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1205"/>
+        <source>That Bitmessage address is not valid.</source>
+        <translation type="unfinished">Tiu Bitmesaĝa adreso ne estas ĝusta.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1213"/>
+        <source>Address does not match chan name</source>
+        <translation>Adreso ne kongruas kun kanalonomo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1213"/>
+        <source>Although the Bitmessage address you entered was valid, it doesn&apos;t match the chan name.</source>
+        <translation type="unfinished">Kvankam la Bitmesaĝa adreso kiun vi enigis estas ĝusta, ĝi ne kongruas kun la kanalonomo.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1222"/>
+        <source>Successfully joined chan. </source>
+        <translation type="unfinished">Sukcese aniĝis al kanalo.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2046"/>
+        <source>Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any).</source>
+        <translation type="unfinished">Bitmesaĝo uzos vian prokurilon (proxy) ekde nun sed eble vi volas permane restartigi Bitmesaĝon nun por ke ĝi fermu eblajn jamajn konektojn.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3245"/>
+        <source>This is a chan address. You cannot use it as a pseudo-mailing list.</source>
+        <translation>Tio estas kanaladreso. Vi ne povas ĝin uzi kiel pseŭdo-dissendolisto.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="557"/>
+        <source>Search</source>
+        <translation>Serĉi</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="558"/>
+        <source>All</source>
+        <translation>Ĉio</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="562"/>
+        <source>Message</source>
+        <translation>Mesaĝo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="630"/>
+        <source>Join / Create chan</source>
+        <translation>Aniĝi / Krei kanalon</translation>
+    </message>
+    <message>
+        <location filename="../bitmessagemain.py" line="3479"/>
+        <source>Encryption key was requested earlier.</source>
+        <translation type="obsolete">Verschlüsselungscode wurde bereits angefragt.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessagemain.py" line="3533"/>
+        <source>Sending a request for the recipient&apos;s encryption key.</source>
+        <translation type="obsolete">Sende eine Anfrage für den Verschlüsselungscode des Empfängers.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessagemain.py" line="3816"/>
+        <source>Doing work necessary to request encryption key.</source>
+        <translation type="obsolete">Verrichte die benötigte Arbeit um den Verschlüsselungscode anzufragen.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessagemain.py" line="3844"/>
+        <source>Broacasting the public key request. This program will auto-retry if they are offline.</source>
+        <translation type="obsolete">Anfrage für den Verschlüsselungscode versendet (wird automatisch periodisch neu verschickt).</translation>
+    </message>
+    <message>
+        <location filename="../bitmessagemain.py" line="3846"/>
+        <source>Sending public key request. Waiting for reply. Requested at %1</source>
+        <translation type="obsolete">Anfrag für den Verschlüsselungscode gesendet. Warte auf Antwort. Angefragt am %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="173"/>
+        <source>Mark Unread</source>
+        <translation>Marki nelegita</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1728"/>
+        <source>Fetched address from namecoin identity.</source>
+        <translation>Venigis adreson de Namecoin identigo. </translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3204"/>
+        <source>Testing...</source>
+        <translation>Testante...</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="542"/>
+        <source>Fetch Namecoin ID</source>
+        <translation>Venigu Namecoin ID</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="623"/>
+        <source>Ctrl+Q</source>
+        <translatorcomment>http://komputeko.net/index_en.php?vorto=ctrl</translatorcomment>
+        <translation type="unfinished">Stir+Q</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="625"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+</context>
+<context>
+    <name>NewAddressDialog</name>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="173"/>
+        <source>Create new Address</source>
+        <translation type="unfinished">Krei novan Adreson</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="174"/>
+        <source>Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a &quot;deterministic&quot; address.
+The &apos;Random Number&apos; option is selected by default but deterministic addresses have several pros and cons:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="176"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Pros:&lt;br/&gt;&lt;/span&gt;You can recreate your addresses on any computer from memory. &lt;br/&gt;You need-not worry about backing up your keys.dat file as long as you can remember your passphrase. &lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Cons:&lt;br/&gt;&lt;/span&gt;You must remember (or write down) your passphrase if you expect to be able to recreate your keys if they are lost. &lt;br/&gt;You must remember the address version number and the stream number along with your passphrase. &lt;br/&gt;If you choose a weak passphrase and someone on the Internet can brute-force it, they can read your messages and send messages as you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="177"/>
+        <source>Use a random number generator to make an address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="178"/>
+        <source>Use a passphrase to make addresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="179"/>
+        <source>Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="180"/>
+        <source>Make deterministic addresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="181"/>
+        <source>Address version number: 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="182"/>
+        <source>In addition to your passphrase, you must remember these numbers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="183"/>
+        <source>Passphrase</source>
+        <translation type="unfinished">Pasfrazo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="184"/>
+        <source>Number of addresses to make based on your passphrase:</source>
+        <translation type="unfinished">Kvanto de farotaj adresoj bazante sur via pasfrazo:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="185"/>
+        <source>Stream number: 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="186"/>
+        <source>Retype passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="187"/>
+        <source>Randomly generate address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="188"/>
+        <source>Label (not shown to anyone except you)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="189"/>
+        <source>Use the most available stream</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="190"/>
+        <source> (best if this is the first of many addresses you will create)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="191"/>
+        <source>Use the same stream as an existing address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="192"/>
+        <source>(saves you some bandwidth and processing power)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewSubscriptionDialog</name>
+    <message>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="57"/>
+        <source>Add new entry</source>
+        <translation type="unfinished">Aldoni novan elementon</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="58"/>
+        <source>Label</source>
+        <translation type="unfinished">Etikedo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="59"/>
+        <source>Address</source>
+        <translation type="unfinished">Adreso</translation>
+    </message>
+</context>
+<context>
+    <name>SpecialAddressBehaviorDialog</name>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="59"/>
+        <source>Special Address Behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="60"/>
+        <source>Behave as a normal address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="61"/>
+        <source>Behave as a pseudo-mailing-list address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="62"/>
+        <source>Mail received to a pseudo-mailing-list address will be automatically broadcast to subscribers (and thus will be public).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="63"/>
+        <source>Name of the pseudo-mailing-list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>aboutDialog</name>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="57"/>
+        <source>About</source>
+        <translation>Pri</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="58"/>
+        <source>PyBitmessage</source>
+        <translation>PyBitmessage</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="59"/>
+        <source>version ?</source>
+        <translation>Veriso ?</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../bitmessageqt/about.py" line="60"/>
+        <source>Copyright © 2013 Jonathan Warren</source>
+        <translation>Kopirajto © 2013 Jonathan Warren</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="61"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Distributed under the MIT/X11 software license; see &lt;a href=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.opensource.org/licenses/mit-license.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Distribuita sub la permesilo &quot;MIT/X11 software license&quot;; vidu &lt;a href=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.opensource.org/licenses/mit-license.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="62"/>
+        <source>This is Beta software.</source>
+        <translation>Tio estas beta-eldono.</translation>
+    </message>
+</context>
+<context>
+    <name>connectDialog</name>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="56"/>
+        <source>Bitmessage</source>
+        <translation>Bitmesaĝo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="57"/>
+        <source>Bitmessage won&apos;t connect to anyone until you let it. </source>
+        <translation>Bitmesaĝo ne konektos antaŭ vi permesas al ĝi.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="58"/>
+        <source>Connect now</source>
+        <translation>Kenekti nun</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="59"/>
+        <source>Let me configure special network settings first</source>
+        <translation>Lasu min unue fari specialajn retajn agordojn</translation>
+    </message>
+</context>
+<context>
+    <name>helpDialog</name>
+    <message>
+        <location filename="../bitmessageqt/help.py" line="45"/>
+        <source>Help</source>
+        <translation>Helpo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/help.py" line="46"/>
+        <source>&lt;a href=&quot;http://Bitmessage.org/wiki/PyBitmessage_Help&quot;&gt;http://Bitmessage.org/wiki/PyBitmessage_Help&lt;/a&gt;</source>
+        <translatorcomment>Mi aldonis &quot;(angle)&quot; ĉar le enhavo de la helpopaĝo ja ne estas tradukita</translatorcomment>
+        <translation>&lt;a href=&quot;http://Bitmessage.org/wiki/PyBitmessage_Help&quot;&gt;http://Bitmessage.org/wiki/PyBitmessage_Help (angle)&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/help.py" line="47"/>
+        <source>As Bitmessage is a collaborative project, help can be found online in the Bitmessage Wiki:</source>
+        <translation>Ĉar Bitmesaĝo estas kunlabora projekto, vi povas trovi helpon enrete ĉe la vikio de Bitmesaĝo:</translation>
+    </message>
+</context>
+<context>
+    <name>iconGlossaryDialog</name>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="82"/>
+        <source>Icon Glossary</source>
+        <translation>Piktograma Glosaro</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="83"/>
+        <source>You have no connections with other peers. </source>
+        <translation>Vi havas neniun konekton al aliaj samtavolano.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="84"/>
+        <source>You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn&apos;t configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node.</source>
+        <translation>Vi konektis almenaŭ al unu smtavolano uzante eliranta konekto, sed vi ankoraŭ ne ricevis enirantajn konetkojn. Via fajroŝirmilo (firewall) aŭ hejma enkursigilo (router) verŝajne estas agordita ne plusendi enirantajn TCP konektojn al via komputilo. Bitmesaĝo funkcios sufiĉe bone sed helpus al la Bitmesaĝa reto se vi permesus enirantajn konektojn kaj tiel estus pli bone konektita nodo.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="85"/>
+        <source>You are using TCP port ?. (This can be changed in the settings).</source>
+        <translation>Vi estas uzanta TCP pordo ?. (Tio estas ŝanĝebla en la agordoj).</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="86"/>
+        <source>You do have connections with other peers and your firewall is correctly configured.</source>
+        <translation>Vi havas konektojn al aliaj samtavolanoj kaj via fajroŝirmilo estas ĝuste agordita.</translation>
+    </message>
+</context>
+<context>
+    <name>newChanDialog</name>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="97"/>
+        <source>Dialog</source>
+        <translation>Dialogo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="98"/>
+        <source>Create a new chan</source>
+        <translation>Krei novan kanalon</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="103"/>
+        <source>Join a chan</source>
+        <translation>Aniĝi al kanalo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="100"/>
+        <source>Create a chan</source>
+        <translation>Krei kanalon</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="105"/>
+        <source>Chan name:</source>
+        <translation>Nomo de kanalo:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="104"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A chan exists when a group of people share the same decryption keys. The keys and bitmessage address used by a chan are generated from a human-friendly word or phrase (the chan name). To send a message to everyone in the chan, send a normal person-to-person message to the chan address.&lt;/p&gt;&lt;p&gt;Chans are experimental and completely unmoderatable.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kanalo ekzistas kiam grupo de personoj havas komunajn malĉifrajn ŝlosilojn. La ŝlosiloj kaj Bitmesaĝa adreso uzita de kanalo estas generita el homlegebla   vorto aŭ frazo (la nomo de la kanalo). Por sendi mesaĝon al ĉiu en la kanalo, sendu normalan person-al-persona mesaĝon al la adreso de la kanalo.&lt;/p&gt;&lt;p&gt;Kanaloj estas eksperimentaj kaj tute malkontroleblaj.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="106"/>
+        <source>Chan bitmessage address:</source>
+        <translation>Bitmesaĝa adreso de kanalo:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="101"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a name for your chan. If you choose a sufficiently complex chan name (like a strong and unique passphrase) and none of your friends share it publicly then the chan will be secure and private. If you and someone else both create a chan with the same chan name then it is currently very likely that they will be the same chan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enmetu nomon por via kanalo. Se vi elektas sufiĉe ampleksan kanalnomon (kiel fortan kaj unikan pasfrazon) kaj neniu el viaj amikoj komunikas ĝin publike la kanalo estos sekura kaj privata. Se vi kaj iu ajn kreas kanalon kun la sama nomo tiam en la momento estas tre verŝajne ke estos la sama kanalo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>regenerateAddressesDialog</name>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="104"/>
+        <source>Regenerate Existing Addresses</source>
+        <translation>Regeneri ekzistantajn adresojn</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="105"/>
+        <source>Regenerate existing addresses</source>
+        <translation>Regeneri ekzistantajn Adresojn</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="106"/>
+        <source>Passphrase</source>
+        <translation>Pasfrazo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="107"/>
+        <source>Number of addresses to make based on your passphrase:</source>
+        <translation>Kvanto de farotaj adresoj bazante sur via pasfrazo:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="108"/>
+        <source>Address version Number:</source>
+        <translation type="unfinished">Adresa versio numero:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="109"/>
+        <source>3</source>
+        <translation>3</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="110"/>
+        <source>Stream number:</source>
+        <translation>Fluo numero:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="111"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="112"/>
+        <source>Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter</source>
+        <translation type="unfinished">Elspezi kelkajn minutojn per aldona tempo de komputila kalkulado por fari adreso(j)n 1 aŭ 2 simbolojn pli mallonge</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="113"/>
+        <source>You must check (or not check) this box just like you did (or didn&apos;t) when you made your addresses the first time.</source>
+        <translation type="unfinished">Vi devas marki (aŭ ne marki) tiun markobutono samkiel vi faris kiam vi generis vian adreson la unuan fojon.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="114"/>
+        <source>If you have previously made deterministic addresses but lost them due to an accident (like hard drive failure), you can regenerate them here. If you used the random number generator to make your addresses then this form will be of no use to you.</source>
+        <translation type="unfinished">Se vi antaŭe kreis determinismajn adresojn sed perdis ĝin akcidente (ekz. en diska paneo), vi povas regeneri ilin ĉi tie. Se vi uzis la generilo de hazardaj numeroj por krei vian adreson tiu formularo ne taŭgos por vi.</translation>
+    </message>
+</context>
+<context>
+    <name>settingsDialog</name>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="335"/>
+        <source>Settings</source>
+        <translation type="unfinished">Agordoj</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="340"/>
+        <source>Start Bitmessage on user login</source>
+        <translation type="unfinished">Startigi Bitmesaĝon dum ensaluto de uzanto</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="336"/>
+        <source>Start Bitmessage in the tray (don&apos;t show main window)</source>
+        <translation type="unfinished">Startigi Bitmesaĝon en la taskopleto (tray) ne montrante tiun fenestron</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="338"/>
+        <source>Minimize to tray</source>
+        <translation type="unfinished">Plejetigi al taskopleto</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="337"/>
+        <source>Show notification when message received</source>
+        <translation type="unfinished">Montri sciigon kiam mesaĝo alvenas</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="341"/>
+        <source>Run in Portable Mode</source>
+        <translation type="unfinished">Ekzekucii en Portebla Reĝimo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="339"/>
+        <source>In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.</source>
+        <translation type="unfinished">En Portebla Reĝimo, mesaĝoj kaj agordoj estas enmemorigitaj en la sama dosierujo kiel la programo mem anstataŭ en la dosierujo por datumoj de aplikaĵoj. Tio igas ĝin komforta ekzekucii Bitmesaĝon el USB poŝmemorilo.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="344"/>
+        <source>User Interface</source>
+        <translation type="unfinished">Fasado</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="345"/>
+        <source>Listening port</source>
+        <translation type="unfinished">Aŭskultanta pordo (port)</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="346"/>
+        <source>Listen for connections on port:</source>
+        <translation type="unfinished">Aŭskultu pri konektoj ĉe pordo:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="347"/>
+        <source>Proxy server / Tor</source>
+        <translation type="unfinished">Prokurila (proxy) servilo / Tor</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="348"/>
+        <source>Type:</source>
+        <translation type="unfinished">Tipo:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="349"/>
+        <source>none</source>
+        <translation type="unfinished">Neniu</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="350"/>
+        <source>SOCKS4a</source>
+        <translation type="unfinished">SOCKS4a</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="351"/>
+        <source>SOCKS5</source>
+        <translation type="unfinished">SOCKS5</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="352"/>
+        <source>Server hostname:</source>
+        <translation type="unfinished">Servilo gastiga nomo (hostname):</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="371"/>
+        <source>Port:</source>
+        <translation type="unfinished">Pordo (port):</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="354"/>
+        <source>Authentication</source>
+        <translation type="unfinished">Aŭtentigo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="372"/>
+        <source>Username:</source>
+        <translation type="unfinished">Uzantnomo:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="356"/>
+        <source>Pass:</source>
+        <translation type="unfinished">Pas:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="358"/>
+        <source>Network Settings</source>
+        <translation type="unfinished">Retaj agordoj</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="359"/>
+        <source>When someone sends you a message, their computer must first complete some work. The difficulty of this work, by default, is 1. You may raise this default for new addresses you create by changing the values here. Any new addresses you create will require senders to meet the higher difficulty. There is one exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically notify them when you next send a message that they need only complete the minimum amount of work: difficulty 1. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="360"/>
+        <source>Total difficulty:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="361"/>
+        <source>Small message difficulty:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="362"/>
+        <source>The &apos;Small message difficulty&apos; mostly only affects the difficulty of sending small messages. Doubling this value makes it almost twice as difficult to send a small message but doesn&apos;t really affect large messages.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="363"/>
+        <source>The &apos;Total difficulty&apos; affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="364"/>
+        <source>Demanded difficulty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="365"/>
+        <source>Here you may set the maximum amount of work you are willing to do to send a message to another person. Setting these values to 0 means that any value is acceptable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="366"/>
+        <source>Maximum acceptable total difficulty:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="367"/>
+        <source>Maximum acceptable small message difficulty:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="368"/>
+        <source>Max acceptable difficulty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="357"/>
+        <source>Listen for incoming connections when using proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="342"/>
+        <source>Willingly include unencrypted destination address when sending to a mobile device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="369"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bitmessage can utilize a different Bitcoin-based program called Namecoin to make addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage address, you can simply tell him to send a message to &lt;span style=&quot; font-style:italic;&quot;&gt;test. &lt;/span&gt;&lt;/p&gt;&lt;p&gt;(Getting your own Bitmessage address into Namecoin is still rather difficult).&lt;/p&gt;&lt;p&gt;Bitmessage can use either namecoind directly or a running nmcontrol instance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="370"/>
+        <source>Host:</source>
+        <translation type="unfinished">Gastiga servilo:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="373"/>
+        <source>Password:</source>
+        <translation type="unfinished">Pasvorto:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="374"/>
+        <source>Test</source>
+        <translation type="unfinished">Testo</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="375"/>
+        <source>Connect to:</source>
+        <translation type="unfinished">Kenekti al:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="376"/>
+        <source>Namecoind</source>
+        <translation type="unfinished">Namecoind</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="377"/>
+        <source>NMControl</source>
+        <translation type="unfinished">NMControl</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="378"/>
+        <source>Namecoin integration</source>
+        <translation type="unfinished">Integrigo de Namecoin</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="343"/>
+        <source>Override automatic language localization (use countycode or language code, e.g. &apos;en_US&apos; or &apos;en&apos;):</source>
+        <translation>Transpasi la automatan reconon de locala lingvo (uzu landokodon aŭ lingvokodon, ekz. &apos;en_US&apos; aŭ &apos;en&apos;):</translation>
+    </message>
+</context>
+</TS>

src/translations/bitmessage_fr.pro

@@ -2,7 +2,7 @@ SOURCES	= 	../addresses.py\
 			../bitmessagemain.py\
 			../class_addressGenerator.py\
 			../class_outgoingSynSender.py\
-			../class_receiveDataThread.py\	
+			../class_receiveDataThread.py\
 			../class_sendDataThread.py\
 			../class_singleCleaner.py\
 			../class_singleListener.py\
@@ -14,10 +14,11 @@ SOURCES	= 	../addresses.py\
 			../helper_inbox.py\
 			../helper_sent.py\
 			../helper_startup.py\
-			../shared.py
+			../shared.py\
 			../bitmessageqt/__init__.py\
 			../bitmessageqt/about.py\
 			../bitmessageqt/bitmessageui.py\
+			../bitmessageqt/connect.py\
 			../bitmessageqt/help.py\
 			../bitmessageqt/iconglossary.py\
 			../bitmessageqt/newaddressdialog.py\
@@ -26,8 +27,7 @@ SOURCES	= 	../addresses.py\
 			../bitmessageqt/regenerateaddresses.py\
 			../bitmessageqt/settings.py\
 			../bitmessageqt/specialaddressbehavior.py
+
 			
-
+TRANSLATIONS	= bitmessage_fr.ts
-TRANSLATIONS	= bitmessage_fr_BE.ts
+CODECFORTR      = UTF-8
-
-CODECFORTR		= UTF-8

src/translations/bitmessage_fr.ts

@@ -1,59 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="fr_BE" sourcelanguage="en">
+<!DOCTYPE TS>
+<TS version="2.0" language="fr" sourcelanguage="en">
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../bitmessageui.py" line="469"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="524"/>
         <source>Bitmessage</source>
         <translation>Bitmessage</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="497"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="565"/>
         <source>To</source>
         <translation>Vers</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="499"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="567"/>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="501"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="569"/>
         <source>Subject</source>
         <translation>Sujet</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="478"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="539"/>
         <source>Received</source>
         <translation>Reçu</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="479"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="540"/>
         <source>Inbox</source>
         <translation>Boîte de réception</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="480"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="541"/>
         <source>Load from Address book</source>
         <translation>Charger depuis carnet d&apos;adresses</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="481"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="543"/>
         <source>Message:</source>
         <translation>Message :</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="482"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="544"/>
         <source>Subject:</source>
         <translation>Sujet :</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="483"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="545"/>
         <source>Send to one or more specific people</source>
         <translation>Envoyer à une ou plusieurs personne(s)</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="484"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="546"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -66,307 +67,307 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="489"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="551"/>
         <source>To:</source>
         <translation>Vers :</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="490"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="552"/>
         <source>From:</source>
         <translation>De :</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="491"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="553"/>
         <source>Broadcast to everyone who is subscribed to your address</source>
         <translation>Diffuser à chaque abonné de cette adresse</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="494"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="556"/>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="493"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="555"/>
         <source>Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.</source>
         <translation>Gardez en tête que les diffusions sont seulement chiffrées avec votre adresse. Quiconque disposant de votre adresse peut les lire.</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="503"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="571"/>
         <source>Status</source>
         <translation>Statut</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="504"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="572"/>
         <source>Sent</source>
         <translation>Envoyé</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="505"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="573"/>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="508"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="576"/>
         <source>Label (not shown to anyone)</source>
         <translation>Label (seulement visible par vous)</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="537"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="605"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="512"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="580"/>
         <source>Stream</source>
         <translation>Flux</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="513"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="581"/>
         <source>Your Identities</source>
         <translation>Vos identités</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="514"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="582"/>
         <source>Here you can subscribe to &apos;broadcast messages&apos; that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab.</source>
         <translation>Vous pouvez ici souscrire aux &apos;messages de diffusion&apos; envoyés par d&apos;autres utilisateurs. Les messages apparaîtront dans votre boîte de récption. Les adresses placées ici outrepassent la liste noire.</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="515"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="583"/>
         <source>Add new Subscription</source>
         <translation>Ajouter un nouvel abonnement</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="518"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="586"/>
         <source>Label</source>
         <translation>Label</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="521"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="589"/>
         <source>Subscriptions</source>
         <translation>Abonnements</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="522"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="590"/>
         <source>The Address book is useful for adding names or labels to other people&apos;s Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the &apos;Add&apos; button, or from your inbox by right-clicking on a message.</source>
         <translation>Le carnet d&apos;adresses est utile pour mettre un nom sur une adresse Bitmessage et ainsi faciliter la gestion de votre boîte de réception. Vous pouvez ajouter des entrées ici en utilisant le bouton &apos;Ajouter&apos;, ou depuis votre boîte de réception en faisant un clic-droit sur un message.</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="532"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="600"/>
         <source>Add new entry</source>
         <translation>Ajouter une nouvelle entrée</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="535"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="603"/>
         <source>Name or Label</source>
         <translation>Nom ou Label</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="529"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="597"/>
         <source>Address Book</source>
         <translation>Carnet d&apos;adresses</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="530"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="598"/>
         <source>Use a Blacklist (Allow all incoming messages except those on the Blacklist)</source>
         <translation>Utiliser une liste noire (autoriser tous les messages entrants exceptés ceux sur la liste noire)</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="531"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="599"/>
         <source>Use a Whitelist (Block all incoming messages except those on the Whitelist)</source>
         <translation>Utiliser une liste blanche (refuser tous les messages entrants exceptés ceux sur la liste blanche)</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="538"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="606"/>
         <source>Blacklist</source>
         <translation>Liste noire</translation>
     </message>
     <message>
         <location filename="../bitmessageui.py" line="540"/>
         <source>Stream Number</source>
-        <translation>Numéro de flux</translation>
+        <translation type="obsolete">Numéro de flux</translation>
     </message>
     <message>
         <location filename="../bitmessageui.py" line="542"/>
         <source>Number of Connections</source>
-        <translation>Nombre de connexions</translation>
+        <translation type="obsolete">Nombre de connexions</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="543"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="611"/>
         <source>Total connections: 0</source>
         <translation>Nombre de connexions total : 0</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="544"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="612"/>
         <source>Since startup at asdf:</source>
         <translation>Depuis le lancement à asdf :</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="545"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="613"/>
         <source>Processed 0 person-to-person message.</source>
         <translation>0 message de pair à pair traité.</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="546"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="614"/>
         <source>Processed 0 public key.</source>
         <translation>0 clé publique traitée.</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="547"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="615"/>
         <source>Processed 0 broadcast.</source>
         <translation>0 message de diffusion traité.</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="548"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="616"/>
         <source>Network Status</source>
         <translation>État du réseau</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="549"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="617"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="557"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="627"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="555"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="624"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="552"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="620"/>
         <source>Import keys</source>
         <translation>Importer les clés</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="553"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="621"/>
         <source>Manage keys</source>
         <translation>Gérer les clés</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="554"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="622"/>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="556"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="626"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="558"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="628"/>
         <source>Regenerate deterministic addresses</source>
         <translation>Regénérer les clés déterministes</translation>
     </message>
     <message>
-        <location filename="../bitmessageui.py" line="559"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="629"/>
         <source>Delete all trashed messages</source>
         <translation>Supprimer tous les messages dans la corbeille</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1054"/>
+        <location filename="../bitmessageqt/__init__.py" line="1319"/>
         <source>Total Connections: %1</source>
         <translation>Nombre total de connexions : %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1078"/>
+        <location filename="../bitmessageqt/__init__.py" line="1344"/>
         <source>Not Connected</source>
         <translation>Déconnecté</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1111"/>
+        <location filename="../bitmessageqt/__init__.py" line="1379"/>
         <source>Connected</source>
         <translation>Connecté</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="706"/>
+        <location filename="../bitmessageqt/__init__.py" line="821"/>
         <source>Show Bitmessage</source>
         <translation>Afficher Bitmessage</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="721"/>
+        <location filename="../bitmessageqt/__init__.py" line="836"/>
         <source>Subscribe</source>
         <translation>S&apos;abonner</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1000"/>
+        <location filename="../bitmessageqt/__init__.py" line="1265"/>
         <source>Processed %1 person-to-person messages.</source>
         <translation>%1 messages de pair à pair traités.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1005"/>
+        <location filename="../bitmessageqt/__init__.py" line="1270"/>
         <source>Processed %1 broadcast messages.</source>
         <translation>%1 messages de diffusion traités.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1010"/>
+        <location filename="../bitmessageqt/__init__.py" line="1275"/>
         <source>Processed %1 public keys.</source>
         <translation>%1 clés publiques traitées.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="549"/>
+        <location filename="../bitmessageqt/__init__.py" line="398"/>
         <source>Since startup on %1</source>
         <translation>Depuis lancement le %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="462"/>
+        <location filename="../bitmessageqt/__init__.py" line="632"/>
         <source>Waiting on their encryption key. Will request it again soon.</source>
         <translation>En attente de la clé de chiffrement. Une nouvelle requête sera bientôt lancée.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="465"/>
+        <location filename="../bitmessageqt/__init__.py" line="635"/>
         <source>Encryption key request queued.</source>
         <translation>Demande de clé de chiffrement en attente.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="468"/>
+        <location filename="../bitmessageqt/__init__.py" line="638"/>
         <source>Queued.</source>
         <translation>En attente.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="474"/>
+        <location filename="../bitmessageqt/__init__.py" line="647"/>
         <source>Need to do work to send message. Work is queued.</source>
         <translation>Travail nécessaire pour envoyer le message. Travail en attente.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="477"/>
+        <location filename="../bitmessageqt/__init__.py" line="650"/>
         <source>Acknowledgement of the message received %1</source>
         <translation>Accusé de réception reçu le %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="480"/>
+        <location filename="../bitmessageqt/__init__.py" line="653"/>
         <source>Broadcast queued.</source>
         <translation>Message de diffusion en attente.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="483"/>
+        <location filename="../bitmessageqt/__init__.py" line="656"/>
         <source>Broadcast on %1</source>
         <translation>Message de diffusion à %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="486"/>
+        <location filename="../bitmessageqt/__init__.py" line="659"/>
         <source>Problem: The work demanded by the recipient is more difficult than you are willing to do. %1</source>
         <translation>Problème : Le travail demandé par le destinataire est plus difficile que ce que vous avez paramétré. %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="492"/>
+        <location filename="../bitmessageqt/__init__.py" line="665"/>
         <source>Forced difficulty override. Send should start soon.</source>
         <translation>Neutralisation forcée de la difficulté. L&apos;envoi devrait bientôt commencer.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="471"/>
+        <location filename="../bitmessageqt/__init__.py" line="641"/>
         <source>Message sent. Waiting on acknowledgement. Sent at %1</source>
         <translation>Message envoyé. En attente de l&apos;accusé de réception. Envoyé le %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="927"/>
+        <location filename="../bitmessageqt/__init__.py" line="1130"/>
         <source>You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file.</source>
         <translation>Vous pouvez éditer vos clés en éditant le fichier keys.dat stocké dans le même répertoire que ce programme. Il est important de faire des sauvegardes de ce fichier.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="931"/>
+        <location filename="../bitmessageqt/__init__.py" line="1134"/>
         <source>You may manage your keys by editing the keys.dat file stored in
  %1 
 It is important that you back up this file.</source>
@@ -375,12 +376,12 @@ It is important that you back up this file.</source>
 Il est important de faire des sauvegardes de ce fichier.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="935"/>
+        <location filename="../bitmessageqt/__init__.py" line="1138"/>
         <source>You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)</source>
         <translation>Vous pouvez éditer vos clés en éditant le fichier keys.dat stocké dans le même répertoire que ce programme. Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l&apos;ouvrir maintenant ? (Assurez-vous de fermer Bitmessage avant d&apos;effectuer des changements.)</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="938"/>
+        <location filename="../bitmessageqt/__init__.py" line="1141"/>
         <source>You may manage your keys by editing the keys.dat file stored in
  %1 
 It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)</source>
@@ -389,384 +390,385 @@ It is important that you back up this file. Would you like to open the file now?
 Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l&apos;ouvrir maintenant ? (Assurez-vous de fermer Bitmessage avant d&apos;effectuer des changements.)</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="140"/>
+        <location filename="../bitmessageqt/__init__.py" line="165"/>
         <source>Add sender to your Address Book</source>
         <translation>Ajouter l&apos;expéditeur au carnet d&apos;adresses</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="235"/>
+        <location filename="../bitmessageqt/__init__.py" line="269"/>
         <source>Move to Trash</source>
         <translation>Envoyer à la Corbeille</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="144"/>
+        <location filename="../bitmessageqt/__init__.py" line="169"/>
         <source>View HTML code as formatted text</source>
         <translation>Voir le code HTML comme du texte formaté</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="258"/>
+        <location filename="../bitmessageqt/__init__.py" line="292"/>
         <source>Enable</source>
         <translation>Activer</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="260"/>
+        <location filename="../bitmessageqt/__init__.py" line="294"/>
         <source>Disable</source>
         <translation>Désactiver</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="256"/>
+        <location filename="../bitmessageqt/__init__.py" line="290"/>
         <source>Copy address to clipboard</source>
         <translation>Copier l&apos;adresse dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="169"/>
+        <location filename="../bitmessageqt/__init__.py" line="200"/>
         <source>Special address behavior...</source>
         <translation>Comportement spécial de l&apos;adresse...</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="187"/>
+        <location filename="../bitmessageqt/__init__.py" line="218"/>
         <source>Send message to this address</source>
         <translation>Envoyer un message à cette adresse</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="191"/>
+        <location filename="../bitmessageqt/__init__.py" line="224"/>
         <source>Add New Address</source>
         <translation>Ajouter nouvelle adresse</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="254"/>
+        <location filename="../bitmessageqt/__init__.py" line="288"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="237"/>
+        <location filename="../bitmessageqt/__init__.py" line="271"/>
         <source>Copy destination address to clipboard</source>
         <translation>Copier l&apos;adresse de destination dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="239"/>
+        <location filename="../bitmessageqt/__init__.py" line="273"/>
         <source>Force send</source>
         <translation>Forcer l&apos;envoi</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="944"/>
+        <location filename="../bitmessageqt/__init__.py" line="1147"/>
         <source>Are you sure you want to delete all trashed messages?</source>
         <translation>Êtes-vous sûr de vouloir supprimer tous les messages dans la corbeille ?</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="955"/>
+        <location filename="../bitmessageqt/__init__.py" line="1158"/>
         <source>You must type your passphrase. If you don&apos;t have one then this is not the form for you.</source>
         <translation>Vous devez taper votre phrase secrète. Si vous n&apos;en avez pas, ce formulaire n&apos;est pas pour vous.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="944"/>
+        <location filename="../bitmessageqt/__init__.py" line="1147"/>
         <source>Delete trash?</source>
         <translation>Supprimer la corbeille ?</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="938"/>
+        <location filename="../bitmessageqt/__init__.py" line="1141"/>
         <source>Open keys.dat?</source>
         <translation>Ouvrir keys.dat ?</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="955"/>
+        <location filename="../bitmessageqt/__init__.py" line="1158"/>
         <source>bad passphrase</source>
         <translation>Mauvaise phrase secrète</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1757"/>
+        <location filename="../bitmessageqt/__init__.py" line="2046"/>
         <source>Restart</source>
         <translation>Redémarrer</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1751"/>
+        <location filename="../bitmessageqt/__init__.py" line="2040"/>
         <source>You must restart Bitmessage for the port number change to take effect.</source>
         <translation>Vous devez redémarrer Bitmessage pour que le changement de port prenne effet.</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1757"/>
         <source>Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections.</source>
-        <translation>Bitmessage utilisera votre proxy à partir de maintenant mais il vous faudra redémarrer Bitmessage pour fermer les connexions existantes.</translation>
+        <translation type="obsolete">Bitmessage utilisera votre proxy à partir de maintenant mais il vous faudra redémarrer Bitmessage pour fermer les connexions existantes.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1911"/>
+        <location filename="../bitmessageqt/__init__.py" line="2227"/>
         <source>Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want.</source>
         <translation>Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre liste. Essayez de renommer l&apos;adresse existante.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1914"/>
+        <location filename="../bitmessageqt/__init__.py" line="2230"/>
         <source>The address you entered was invalid. Ignoring it.</source>
         <translation>L&apos;adresse que vous avez entrée est invalide. Adresse ignorée.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1967"/>
+        <location filename="../bitmessageqt/__init__.py" line="2280"/>
         <source>Passphrase mismatch</source>
         <translation>Phrases secrètes différentes</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1967"/>
+        <location filename="../bitmessageqt/__init__.py" line="2280"/>
         <source>The passphrase you entered twice doesn&apos;t match. Try again.</source>
         <translation>Les phrases secrètes entrées sont différentes. Réessayez.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1970"/>
+        <location filename="../bitmessageqt/__init__.py" line="2283"/>
         <source>Choose a passphrase</source>
         <translation>Choisissez une phrase secrète</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1970"/>
+        <location filename="../bitmessageqt/__init__.py" line="2283"/>
         <source>You really do need a passphrase.</source>
         <translation>Vous devez vraiment utiliser une phrase secrète.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1998"/>
+        <location filename="../bitmessageqt/__init__.py" line="2306"/>
         <source>All done. Closing user interface...</source>
         <translation>Terminé. Fermeture de l&apos;interface...</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2046"/>
+        <location filename="../bitmessageqt/__init__.py" line="2380"/>
         <source>Address is gone</source>
         <translation>L&apos;adresse a disparu</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2046"/>
+        <location filename="../bitmessageqt/__init__.py" line="2380"/>
         <source>Bitmessage cannot find your address %1. Perhaps you removed it?</source>
         <translation>Bitmessage ne peut pas trouver votre adresse %1. Peut-être l&apos;avez-vous supprimée ?</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2050"/>
+        <location filename="../bitmessageqt/__init__.py" line="2384"/>
         <source>Address disabled</source>
         <translation>Adresse désactivée</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2050"/>
+        <location filename="../bitmessageqt/__init__.py" line="2384"/>
         <source>Error: The address from which you are trying to send is disabled. You&apos;ll have to enable it on the &apos;Your Identities&apos; tab before using it.</source>
         <translation>Erreur : L&apos;adresse avec laquelle vous essayez de communiquer est désactivée. Vous devez d&apos;abord l&apos;activer dans l&apos;onglet &apos;Vos identités&apos; avant de l&apos;utiliser.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2102"/>
+        <location filename="../bitmessageqt/__init__.py" line="2437"/>
         <source>Entry added to the Address Book. Edit the label to your liking.</source>
         <translation>Entrée ajoutée au carnet d&apos;adresses. Éditez le label selon votre souhait.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2105"/>
+        <location filename="../bitmessageqt/__init__.py" line="2440"/>
         <source>Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.</source>
         <translation>Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre carnet d&apos;adresses. Essayez de renommer l&apos;adresse existante.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2148"/>
+        <location filename="../bitmessageqt/__init__.py" line="2502"/>
         <source>Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.</source>
         <translation>Messages déplacés dans la corbeille. Il n&apos;y a pas d&apos;interface utilisateur pour voir votre corbeille, mais ils sont toujours présents sur le disque si vous souhaitez les récupérer.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2242"/>
+        <location filename="../bitmessageqt/__init__.py" line="2596"/>
         <source>No addresses selected.</source>
         <translation>Aucune adresse sélectionnée.</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2660"/>
         <source>Options have been disabled because they either aren&apos;t applicable or because they haven&apos;t yet been implimented for your operating system.</source>
-        <translation>Certaines options ont été désactivées car elles n&apos;étaient pas applicables ou car elles n&apos;ont pas encore été implémentées pour votre système d&apos;exploitation.</translation>
+        <translation type="obsolete">Certaines options ont été désactivées car elles n&apos;étaient pas applicables ou car elles n&apos;ont pas encore été implémentées pour votre système d&apos;exploitation.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2778"/>
+        <location filename="../bitmessageqt/__init__.py" line="3264"/>
         <source>The address should start with &apos;&apos;BM-&apos;&apos;</source>
         <translation>L&apos;adresse devrait commencer avec &quot;BM-&quot;</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2781"/>
+        <location filename="../bitmessageqt/__init__.py" line="3267"/>
         <source>The address is not typed or copied correctly (the checksum failed).</source>
         <translation>L&apos;adresse n&apos;est pas correcte (la somme de contrôle a échoué).</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2784"/>
+        <location filename="../bitmessageqt/__init__.py" line="3270"/>
         <source>The version number of this address is higher than this software can support. Please upgrade Bitmessage.</source>
         <translation>Le numéro de version de cette adresse est supérieur à celui que le programme peut supporter. Veuiller mettre Bitmessage à jour.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2787"/>
+        <location filename="../bitmessageqt/__init__.py" line="3273"/>
         <source>The address contains invalid characters.</source>
         <translation>L&apos;adresse contient des caractères invalides.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2790"/>
+        <location filename="../bitmessageqt/__init__.py" line="3276"/>
         <source>Some data encoded in the address is too short.</source>
         <translation>Certaines données encodées dans l&apos;adresse sont trop courtes.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2793"/>
+        <location filename="../bitmessageqt/__init__.py" line="3279"/>
         <source>Some data encoded in the address is too long.</source>
         <translation>Certaines données encodées dans l&apos;adresse sont trop longues.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2796"/>
+        <location filename="../bitmessageqt/__init__.py" line="3282"/>
         <source>Address is valid.</source>
         <translation>L&apos;adresse est valide.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2828"/>
+        <location filename="../bitmessageqt/__init__.py" line="3324"/>
         <source>You are using TCP port %1. (This can be changed in the settings).</source>
         <translation>Vous utilisez le port TCP %1. (Ceci peut être changé dans les paramètres).</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1294"/>
+        <location filename="../bitmessageqt/__init__.py" line="1559"/>
         <source>Error: Bitmessage addresses start with BM-   Please check %1</source>
         <translation>Erreur : Les adresses Bitmessage commencent avec BM-   Merci de vérifier %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1300"/>
+        <location filename="../bitmessageqt/__init__.py" line="1565"/>
         <source>Error: The address %1 contains invalid characters. Please check it.</source>
         <translation>Erreur : L&apos;adresse %1 contient des caractères invalides. Veuillez la vérifier.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1297"/>
+        <location filename="../bitmessageqt/__init__.py" line="1562"/>
         <source>Error: The address %1 is not typed or copied correctly. Please check it.</source>
         <translation>Erreur : L&apos;adresse %1 n&apos;est pas correctement recopiée. Veuillez la vérifier.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1303"/>
+        <location filename="../bitmessageqt/__init__.py" line="1568"/>
         <source>Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever.</source>
         <translation>Erreur : La version de l&apos;adresse %1 est trop grande. Pensez à mettre à jour Bitmessage.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1306"/>
+        <location filename="../bitmessageqt/__init__.py" line="1571"/>
         <source>Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance.</source>
         <translation>Erreur : Certaines données encodées dans l&apos;adresse %1 sont trop courtes. Il peut y avoir un problème avec le logiciel ou votre connaissance. </translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1309"/>
+        <location filename="../bitmessageqt/__init__.py" line="1574"/>
         <source>Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance.</source>
         <translation>Erreur : Certaines données encodées dans l&apos;adresse %1 sont trop longues. Il peut y avoir un problème avec le logiciel ou votre connaissance.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1312"/>
+        <location filename="../bitmessageqt/__init__.py" line="1577"/>
         <source>Error: Something is wrong with the address %1.</source>
         <translation>Erreur : Problème avec l&apos;adresse %1.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1380"/>
+        <location filename="../bitmessageqt/__init__.py" line="1644"/>
         <source>Error: You must specify a From address. If you don&apos;t have one, go to the &apos;Your Identities&apos; tab.</source>
         <translation>Erreur : Vous devez spécifier une adresse d&apos;expéditeur. Si vous n&apos;en avez pas, rendez-vous dans l&apos;onglet &apos;Vos identités&apos;.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1324"/>
+        <location filename="../bitmessageqt/__init__.py" line="1588"/>
         <source>Sending to your address</source>
         <translation>Envoi vers votre adresse</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1324"/>
+        <location filename="../bitmessageqt/__init__.py" line="1588"/>
         <source>Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.</source>
         <translation>Erreur : Une des adresses vers lesquelles vous envoyez un message, %1, est vôtre. Malheureusement, Bitmessage ne peut pas traiter ses propres messages. Essayez de lancer un second client sur une machine différente.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1330"/>
+        <location filename="../bitmessageqt/__init__.py" line="1594"/>
         <source>Address version number</source>
         <translation>Numéro de version de l&apos;adresse</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1330"/>
+        <location filename="../bitmessageqt/__init__.py" line="1594"/>
         <source>Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version.</source>
         <translation>Concernant l&apos;adresse %1, Bitmessage ne peut pas comprendre les numéros de version de %2. Essayez de mettre à jour Bitmessage vers la dernière version.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1334"/>
+        <location filename="../bitmessageqt/__init__.py" line="1598"/>
         <source>Stream number</source>
         <translation>Numéro de flux</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1334"/>
+        <location filename="../bitmessageqt/__init__.py" line="1598"/>
         <source>Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version.</source>
         <translation>Concernant l&apos;adresse %1, Bitmessage ne peut pas supporter les nombres de flux de %2. Essayez de mettre à jour Bitmessage vers la dernière version.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1339"/>
+        <location filename="../bitmessageqt/__init__.py" line="1603"/>
         <source>Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won&apos;t send until you connect.</source>
         <translation>Avertissement : Vous êtes actuellement déconnecté. Bitmessage fera le travail nécessaire pour envoyer le message mais il ne sera pas envoyé tant que vous ne vous connecterez pas.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1376"/>
+        <location filename="../bitmessageqt/__init__.py" line="1640"/>
         <source>Your &apos;To&apos; field is empty.</source>
         <translation>Votre champ &apos;Vers&apos; est vide.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1453"/>
+        <location filename="../bitmessageqt/__init__.py" line="1717"/>
         <source>Right click one or more entries in your address book and select &apos;Send message to this address&apos;.</source>
         <translation>Cliquez droit sur une ou plusieurs entrées dans votre carnet d&apos;adresses et sélectionnez &apos;Envoyer un message à ces adresses&apos;.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1692"/>
+        <location filename="../bitmessageqt/__init__.py" line="2610"/>
         <source>Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want.</source>
         <translation>Erreur : Vous ne pouvez pas ajouter une même adresse à vos abonnements deux fois. Essayez de renommer l&apos;adresse existante.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1160"/>
+        <location filename="../bitmessageqt/__init__.py" line="1425"/>
         <source>Message trashed</source>
         <translation>Message envoyé à la corbeille</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="70"/>
+        <location filename="../bitmessageqt/__init__.py" line="91"/>
         <source>One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now?</source>
         <translation>Une de vos adresses, %1, est une vieille adresse de la version 1. Les adresses de la version 1 ne sont plus supportées. Nous pourrions la supprimer maintenant ?</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="495"/>
+        <location filename="../bitmessageqt/__init__.py" line="668"/>
         <source>Unknown status: %1 %2</source>
         <translation>Statut inconnu : %1 %2</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1073"/>
+        <location filename="../bitmessageqt/__init__.py" line="1338"/>
         <source>Connection lost</source>
         <translation>Connexion perdue</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="178"/>
         <source>SOCKS5 Authentication problem: %1</source>
-        <translation>Problème d&apos;authentification SOCKS5 : %1</translation>
+        <translation type="obsolete">Problème d&apos;authentification SOCKS5 : %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="138"/>
+        <location filename="../bitmessageqt/__init__.py" line="163"/>
         <source>Reply</source>
+        <translatorcomment>.</translatorcomment>
         <translation>Répondre</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="3907"/>
         <source>Generating one new address</source>
-        <translation>Génération d&apos;une nouvelle adresse</translation>
+        <translation type="obsolete">Génération d&apos;une nouvelle adresse</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="3978"/>
         <source>Done generating address. Doing work necessary to broadcast it...</source>
-        <translation>Génération de l&apos;adresse terminée. Travail pour la diffuser en cours...</translation>
+        <translation type="obsolete">Génération de l&apos;adresse terminée. Travail pour la diffuser en cours...</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="4101"/>
         <source>Done generating address</source>
-        <translation>Génération de l&apos;adresse terminée</translation>
+        <translation type="obsolete">Génération de l&apos;adresse terminée</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="3779"/>
         <source>Message sent. Waiting on acknowledgement. Sent on %1</source>
-        <translation>Message envoyé. En attente de l&apos;accusé de réception. Envoyé le %1</translation>
+        <translation type="obsolete">Message envoyé. En attente de l&apos;accusé de réception. Envoyé le %1</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="3698"/>
         <source>Error! Could not find sender address (your address) in the keys.dat file.</source>
-        <translation>Erreur ! L&apos;adresse de l&apos;expéditeur (vous) n&apos;a pas pu être trouvée dans le fichier keys.dat.</translation>
+        <translation type="obsolete">Erreur ! L&apos;adresse de l&apos;expéditeur (vous) n&apos;a pas pu être trouvée dans le fichier keys.dat.</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="3406"/>
         <source>Doing work necessary to send broadcast...</source>
-        <translation>Travail pour envoyer la diffusion en cours...</translation>
+        <translation type="obsolete">Travail pour envoyer la diffusion en cours...</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="3422"/>
         <source>Broadcast sent on %1</source>
-        <translation>Message de diffusion envoyé le %1</translation>
+        <translation type="obsolete">Message de diffusion envoyé le %1</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="3542"/>
         <source>Looking up the receiver&apos;s public key</source>
-        <translation>Recherche de la clé publique du destinataire</translation>
+        <translation type="obsolete">Recherche de la clé publique du destinataire</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="3615"/>
@@ -777,64 +779,209 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l&apos;o
         <location filename="../bitmessagemain.py" line="3618"/>
         <source>Doing work necessary to send message.
 Receiver&apos;s required difficulty: %1 and %2</source>
-        <translation>Travail nécessaire pour envoyer le message.
+        <translation type="obsolete">Travail nécessaire pour envoyer le message.
 Difficulté requise par le destinataire : %1 et %2</translation>
     </message>
     <message>
         <location filename="../bitmessagemain.py" line="3632"/>
         <source>Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do.</source>
-        <translation>Problème : Le travail demandé par le destinataire (%1 et %2) est plus difficile que ce que vous souhaitez faire.</translation>
+        <translation type="obsolete">Problème : Le travail demandé par le destinataire (%1 et %2) est plus difficile que ce que vous souhaitez faire.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1431"/>
+        <location filename="../bitmessageqt/__init__.py" line="1695"/>
         <source>Work is queued.</source>
         <translation>Travail en attente.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1520"/>
+        <location filename="../bitmessageqt/__init__.py" line="1805"/>
         <source>Work is queued. %1</source>
         <translation>Travail en attente. %1</translation>
     </message>
-    <message>
-        <location filename="../bitmessagemain.py" line="1088"/>
-        <source>Acknowledgement of the message received. %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../bitmessagemain.py" line="3605"/>
         <source>Doing work necessary to send message.
 There is no required difficulty for version 2 addresses like this.</source>
-        <translation>Travail nécessaire pour envoyer le message en cours. 
+        <translation type="obsolete">Travail nécessaire pour envoyer le message en cours. 
 Il n&apos;y a pas de difficulté requise pour ces adresses de version 2.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="489"/>
+        <location filename="../bitmessageqt/__init__.py" line="662"/>
         <source>Problem: The recipient&apos;s encryption key is no good. Could not encrypt message. %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bitmessagemain.py" line="3479"/>
+        <location filename="../bitmessageqt/__init__.py" line="171"/>
-        <source>Encryption key was requested earlier.</source>
+        <source>Save message as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bitmessagemain.py" line="3533"/>
+        <location filename="../bitmessageqt/__init__.py" line="173"/>
-        <source>Sending a request for the recipient&apos;s encryption key.</source>
+        <source>Mark Unread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bitmessagemain.py" line="3816"/>
+        <location filename="../bitmessageqt/__init__.py" line="222"/>
-        <source>Doing work necessary to request encryption key.</source>
+        <source>Subscribe to this address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bitmessagemain.py" line="3844"/>
+        <location filename="../bitmessageqt/__init__.py" line="644"/>
-        <source>Broacasting the public key request. This program will auto-retry if they are offline.</source>
+        <source>Message sent. Sent at %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bitmessagemain.py" line="3846"/>
+        <location filename="../bitmessageqt/__init__.py" line="1197"/>
-        <source>Sending public key request. Waiting for reply. Requested at %1</source>
+        <source>Chan name needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1197"/>
+        <source>You didn&apos;t enter a chan name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1217"/>
+        <source>Address already present</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1217"/>
+        <source>Could not add chan because it appears to already be one of your identities.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1222"/>
+        <source>Success</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1192"/>
+        <source>Successfully created chan. To let others join your chan, give them the chan name and this Bitmessage address: %1. This address also appears in &apos;Your Identities&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1201"/>
+        <source>Address too new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1201"/>
+        <source>Although that Bitmessage address might be valid, its version number is too new for us to handle. Perhaps you need to upgrade Bitmessage.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1205"/>
+        <source>Address invalid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1205"/>
+        <source>That Bitmessage address is not valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1213"/>
+        <source>Address does not match chan name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1213"/>
+        <source>Although the Bitmessage address you entered was valid, it doesn&apos;t match the chan name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1222"/>
+        <source>Successfully joined chan. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1728"/>
+        <source>Fetched address from namecoin identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1874"/>
+        <source>New Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1874"/>
+        <source>From </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2046"/>
+        <source>Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2476"/>
+        <source>Save As...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2485"/>
+        <source>Write error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3063"/>
+        <source>Options have been disabled because they either aren&apos;t applicable or because they haven&apos;t yet been implemented for your operating system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3204"/>
+        <source>Testing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3245"/>
+        <source>This is a chan address. You cannot use it as a pseudo-mailing list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="557"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="558"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="562"/>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="542"/>
+        <source>Fetch Namecoin ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="608"/>
+        <source>Stream #</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="610"/>
+        <source>Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="623"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished">Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="625"/>
+        <source>F1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="630"/>
+        <source>Join / Create chan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -849,99 +996,99 @@ Il n&apos;y a pas de difficulté requise pour ces adresses de version 2.</transl
 <context>
     <name>NewAddressDialog</name>
     <message>
-        <location filename="../newaddressdialog.py" line="173"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="173"/>
         <source>Create new Address</source>
         <translation>Créer une nouvelle adresse</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="174"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="174"/>
         <source>Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a &quot;deterministic&quot; address.
 The &apos;Random Number&apos; option is selected by default but deterministic addresses have several pros and cons:</source>
         <translation>Vous pouvez générer autant d&apos;adresses que vous le souhaitez. En effet, nous vous encourageons à créer et à délaisser vos adresses. Vous pouvez générer des adresses en utilisant des nombres aléatoires ou en utilisant une phrase secrète. Si vous utilisez une phrase secrète, l&apos;adresse sera une adresse &quot;déterministe&quot;.
 L&apos;option &apos;Nombre Aléatoire&apos; est sélectionnée par défaut mais les adresses déterministes ont certains avantages et inconvénients :</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="176"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Pros:&lt;br/&gt;&lt;/span&gt;You can recreate your addresses on any computer from memory. &lt;br/&gt;You need-not worry about backing up your keys.dat file as long as you can remember your passphrase. &lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Cons:&lt;br/&gt;&lt;/span&gt;You must remember (or write down) your passphrase if you expect to be able to recreate your keys if they are lost. &lt;br/&gt;You must remember the address version number and the stream number along with your passphrase. &lt;br/&gt;If you choose a weak passphrase and someone on the Internet can brute-force it, they can read your messages and send messages as you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Avantages :&lt;br/&gt;&lt;/span&gt;Vous pouvez recréer vos adresses sur n&apos;importe quel ordinateur. &lt;br/&gt;Vous n&apos;avez pas à vous inquiéter à propos de la sauvegarde de votre fichier keys.dat tant que vous vous rappelez de votre phrase secrète. &lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Inconvénients :&lt;br/&gt;&lt;/span&gt;Vous devez vous rappeler (ou noter) votre phrase secrète si vous souhaitez être capable de récréer vos clés si vous les perdez. &lt;br/&gt;Vous devez vous rappeler du numéro de version de l&apos;adresse et du numéro de flux en plus de votre phrase secrète. &lt;br/&gt;Si vous choisissez une phrase secrète faible et que quelqu&apos;un sur Internet parvient à la brute-forcer, il pourra lire vos messages et vous en envoyer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="177"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="177"/>
         <source>Use a random number generator to make an address</source>
         <translation>Utiliser un générateur de nombres aléatoires pour créer une adresse</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="178"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="178"/>
         <source>Use a passphrase to make addresses</source>
         <translation>Utiliser une phrase secrète pour créer une adresse</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="179"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="179"/>
         <source>Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter</source>
         <translation>Créer une adresse plus courte d&apos;un ou deux caractères (nécessite plusieurs minutes de temps de calcul supplémentaires)</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="180"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="180"/>
         <source>Make deterministic addresses</source>
         <translation>Créer une adresse déterministe</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="181"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="181"/>
         <source>Address version number: 3</source>
         <translation>Numéro de version de l&apos;adresse : 3</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="182"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="182"/>
         <source>In addition to your passphrase, you must remember these numbers:</source>
         <translation>En plus de votre phrase secrète, vous devez vous rappeler ces numéros :</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="183"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="183"/>
         <source>Passphrase</source>
         <translation>Phrase secrète</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="184"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="184"/>
         <source>Number of addresses to make based on your passphrase:</source>
         <translation>Nombre d&apos;adresses à créer sur base de votre phrase secrète :</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="185"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="185"/>
         <source>Stream number: 1</source>
         <translation>Nombre de flux : 1</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="186"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="186"/>
         <source>Retype passphrase</source>
         <translation>Retapez la phrase secrète</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="187"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="187"/>
         <source>Randomly generate address</source>
         <translation>Générer une adresse de manière aléatoire</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="188"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="188"/>
         <source>Label (not shown to anyone except you)</source>
         <translation>Label (seulement visible par vous)</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="189"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="189"/>
         <source>Use the most available stream</source>
         <translation>Utiliser le flux le plus disponible</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="190"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="190"/>
         <source> (best if this is the first of many addresses you will create)</source>
         <translation> (préférable si vous générez votre première adresse)</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="191"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="191"/>
         <source>Use the same stream as an existing address</source>
         <translation>Utiliser le même flux qu&apos;une adresse existante</translation>
     </message>
     <message>
-        <location filename="../newaddressdialog.py" line="192"/>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="192"/>
         <source>(saves you some bandwidth and processing power)</source>
         <translation>(économise de la bande passante et de la puissance de calcul)</translation>
     </message>
@@ -949,17 +1096,17 @@ L&apos;option &apos;Nombre Aléatoire&apos; est sélectionnée par défaut mais
 <context>
     <name>NewSubscriptionDialog</name>
     <message>
-        <location filename="../newsubscriptiondialog.py" line="57"/>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="57"/>
         <source>Add new entry</source>
         <translation>Ajouter une nouvelle entrée</translation>
     </message>
     <message>
-        <location filename="../newsubscriptiondialog.py" line="58"/>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="58"/>
         <source>Label</source>
         <translation>Label</translation>
     </message>
     <message>
-        <location filename="../newsubscriptiondialog.py" line="59"/>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="59"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
@@ -967,27 +1114,27 @@ L&apos;option &apos;Nombre Aléatoire&apos; est sélectionnée par défaut mais
 <context>
     <name>SpecialAddressBehaviorDialog</name>
     <message>
-        <location filename="../specialaddressbehavior.py" line="59"/>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="59"/>
         <source>Special Address Behavior</source>
         <translation>Comportement spécial de l&apos;adresse</translation>
     </message>
     <message>
-        <location filename="../specialaddressbehavior.py" line="60"/>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="60"/>
         <source>Behave as a normal address</source>
         <translation>Se comporter comme une adresse normale</translation>
     </message>
     <message>
-        <location filename="../specialaddressbehavior.py" line="61"/>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="61"/>
         <source>Behave as a pseudo-mailing-list address</source>
         <translation>Se comporter comme une adresse d&apos;une pseudo liste de diffusion</translation>
     </message>
     <message>
-        <location filename="../specialaddressbehavior.py" line="62"/>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="62"/>
         <source>Mail received to a pseudo-mailing-list address will be automatically broadcast to subscribers (and thus will be public).</source>
         <translation>Un mail reçu sur une adresse d&apos;une  pseudo liste de diffusion sera automatiquement diffusé aux abonnés (et sera donc public).</translation>
     </message>
     <message>
-        <location filename="../specialaddressbehavior.py" line="63"/>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="63"/>
         <source>Name of the pseudo-mailing-list:</source>
         <translation>Nom de la pseudo liste de diffusion :</translation>
     </message>
@@ -995,50 +1142,73 @@ L&apos;option &apos;Nombre Aléatoire&apos; est sélectionnée par défaut mais
 <context>
     <name>aboutDialog</name>
     <message>
-        <location filename="../about.py" line="58"/>
+        <location filename="../bitmessageqt/about.py" line="58"/>
         <source>PyBitmessage</source>
         <translation>PyBitmessage</translation>
     </message>
     <message>
-        <location filename="../about.py" line="59"/>
+        <location filename="../bitmessageqt/about.py" line="59"/>
         <source>version ?</source>
         <translation>version ?</translation>
     </message>
     <message>
-        <location filename="../about.py" line="57"/>
+        <location filename="../bitmessageqt/about.py" line="57"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
-    <message encoding="UTF-8">
+    <message utf8="true">
-        <location filename="../about.py" line="60"/>
+        <location filename="../bitmessageqt/about.py" line="60"/>
         <source>Copyright © 2013 Jonathan Warren</source>
         <translation>Copyright © 2013 Jonathan Warren</translation>
     </message>
     <message>
-        <location filename="../about.py" line="61"/>
+        <location filename="../bitmessageqt/about.py" line="61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Distributed under the MIT/X11 software license; see &lt;a href=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.opensource.org/licenses/mit-license.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Distribué sous la licence logicielle MIT/X11; voir &lt;a href=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.opensource.org/licenses/mit-license.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../about.py" line="62"/>
+        <location filename="../bitmessageqt/about.py" line="62"/>
         <source>This is Beta software.</source>
         <translation>Version bêta.</translation>
     </message>
 </context>
+<context>
+    <name>connectDialog</name>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="56"/>
+        <source>Bitmessage</source>
+        <translation type="unfinished">Bitmessage</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="57"/>
+        <source>Bitmessage won&apos;t connect to anyone until you let it. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="58"/>
+        <source>Connect now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="59"/>
+        <source>Let me configure special network settings first</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>helpDialog</name>
     <message>
-        <location filename="../help.py" line="45"/>
+        <location filename="../bitmessageqt/help.py" line="45"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../help.py" line="46"/>
+        <location filename="../bitmessageqt/help.py" line="46"/>
         <source>&lt;a href=&quot;http://Bitmessage.org/wiki/PyBitmessage_Help&quot;&gt;http://Bitmessage.org/wiki/PyBitmessage_Help&lt;/a&gt;</source>
         <translation>&lt;a href=&quot;http://Bitmessage.org/wiki/PyBitmessage_Help&quot;&gt;Wiki d&apos;aide de PyBitmessage&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../help.py" line="47"/>
+        <location filename="../bitmessageqt/help.py" line="47"/>
         <source>As Bitmessage is a collaborative project, help can be found online in the Bitmessage Wiki:</source>
         <translation>Bitmessage étant un projet collaboratif, une aide peut être trouvée en ligne sur le Wiki de Bitmessage :</translation>
     </message>
@@ -1046,85 +1216,128 @@ L&apos;option &apos;Nombre Aléatoire&apos; est sélectionnée par défaut mais
 <context>
     <name>iconGlossaryDialog</name>
     <message>
-        <location filename="../iconglossary.py" line="82"/>
+        <location filename="../bitmessageqt/iconglossary.py" line="82"/>
         <source>Icon Glossary</source>
         <translation>Glossaire des icônes</translation>
     </message>
     <message>
-        <location filename="../iconglossary.py" line="83"/>
+        <location filename="../bitmessageqt/iconglossary.py" line="83"/>
         <source>You have no connections with other peers. </source>
         <translation>Vous n&apos;avez aucune connexion avec d&apos;autres pairs.</translation>
     </message>
     <message>
-        <location filename="../iconglossary.py" line="84"/>
+        <location filename="../bitmessageqt/iconglossary.py" line="84"/>
         <source>You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn&apos;t configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node.</source>
         <translation>Vous avez au moins une connexion sortante avec un pair mais vous n&apos;avez encore reçu aucune connexion entrante. Votre pare-feu ou routeur n&apos;est probablement pas configuré pour transmettre les connexions TCP vers votre ordinateur. Bitmessage fonctionnera correctement, mais le réseau Bitmessage se portera mieux si vous autorisez les connexions entrantes. Cela vous permettra d&apos;être un nœud mieux connecté.</translation>
     </message>
     <message>
-        <location filename="../iconglossary.py" line="85"/>
+        <location filename="../bitmessageqt/iconglossary.py" line="85"/>
         <source>You are using TCP port ?. (This can be changed in the settings).</source>
         <translation>Vous utilisez le port TCP ?. (Peut être changé dans les paramètres).</translation>
     </message>
     <message>
-        <location filename="../iconglossary.py" line="86"/>
+        <location filename="../bitmessageqt/iconglossary.py" line="86"/>
         <source>You do have connections with other peers and your firewall is correctly configured.</source>
         <translation>Vous avez des connexions avec d&apos;autres pairs et votre pare-feu est configuré correctement.</translation>
     </message>
 </context>
+<context>
+    <name>newChanDialog</name>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="97"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="98"/>
+        <source>Create a new chan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="103"/>
+        <source>Join a chan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="100"/>
+        <source>Create a chan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="101"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a name for your chan. If you choose a sufficiently complex chan name (like a strong and unique passphrase) and none of your friends share it publicly then the chan will be secure and private. If you and someone else both create a chan with the same chan name then it is currently very likely that they will be the same chan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="105"/>
+        <source>Chan name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="104"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A chan exists when a group of people share the same decryption keys. The keys and bitmessage address used by a chan are generated from a human-friendly word or phrase (the chan name). To send a message to everyone in the chan, send a normal person-to-person message to the chan address.&lt;/p&gt;&lt;p&gt;Chans are experimental and completely unmoderatable.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="106"/>
+        <source>Chan bitmessage address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>regenerateAddressesDialog</name>
     <message>
-        <location filename="../regenerateaddresses.py" line="104"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="104"/>
         <source>Regenerate Existing Addresses</source>
         <translation>Regénérer des adresses existantes</translation>
     </message>
     <message>
-        <location filename="../regenerateaddresses.py" line="105"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="105"/>
         <source>Regenerate existing addresses</source>
         <translation>Regénérer des adresses existantes</translation>
     </message>
     <message>
-        <location filename="../regenerateaddresses.py" line="106"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="106"/>
         <source>Passphrase</source>
         <translation>Phrase secrète</translation>
     </message>
     <message>
-        <location filename="../regenerateaddresses.py" line="107"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="107"/>
         <source>Number of addresses to make based on your passphrase:</source>
         <translation>Nombre d&apos;adresses basées sur votre phrase secrète à créer :</translation>
     </message>
     <message>
-        <location filename="../regenerateaddresses.py" line="108"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="108"/>
         <source>Address version Number:</source>
         <translation>Numéro de version de l&apos;adresse :</translation>
     </message>
     <message>
-        <location filename="../regenerateaddresses.py" line="109"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="109"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
-        <location filename="../regenerateaddresses.py" line="110"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="110"/>
         <source>Stream number:</source>
         <translation>Numéro du flux :</translation>
     </message>
     <message>
-        <location filename="../regenerateaddresses.py" line="111"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="111"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../regenerateaddresses.py" line="112"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="112"/>
         <source>Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter</source>
         <translation>Créer une adresse plus courte d&apos;un ou deux caractères (nécessite plusieurs minutes de temps de calcul supplémentaires)</translation>
     </message>
     <message>
-        <location filename="../regenerateaddresses.py" line="113"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="113"/>
         <source>You must check (or not check) this box just like you did (or didn&apos;t) when you made your addresses the first time.</source>
         <translation>Vous devez cocher (ou décocher) cette case comme vous l&apos;aviez fait (ou non) lors de la création de vos adresses la première fois.</translation>
     </message>
     <message>
-        <location filename="../regenerateaddresses.py" line="114"/>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="114"/>
         <source>If you have previously made deterministic addresses but lost them due to an accident (like hard drive failure), you can regenerate them here. If you used the random number generator to make your addresses then this form will be of no use to you.</source>
         <translation>Si vous aviez généré des adresses déterministes mais les avez perdues à cause d&apos;un accident, vous pouvez les regénérer ici. Si vous aviez utilisé le générateur de nombres aléatoires pour créer vos adresses, ce formulaire ne vous sera d&apos;aucune utilité.</translation>
     </message>
@@ -1132,159 +1345,214 @@ L&apos;option &apos;Nombre Aléatoire&apos; est sélectionnée par défaut mais
 <context>
     <name>settingsDialog</name>
     <message>
-        <location filename="../settings.py" line="241"/>
+        <location filename="../bitmessageqt/settings.py" line="335"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="242"/>
+        <location filename="../bitmessageqt/settings.py" line="340"/>
         <source>Start Bitmessage on user login</source>
         <translation>Démarrer Bitmessage à la connexion de l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="243"/>
+        <location filename="../bitmessageqt/settings.py" line="336"/>
         <source>Start Bitmessage in the tray (don&apos;t show main window)</source>
         <translation>Démarrer Bitmessage dans la barre des tâches (ne pas montrer la fenêtre principale)</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="244"/>
+        <location filename="../bitmessageqt/settings.py" line="338"/>
         <source>Minimize to tray</source>
         <translation>Minimiser dans la barre des tâches</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="245"/>
+        <location filename="../bitmessageqt/settings.py" line="337"/>
         <source>Show notification when message received</source>
         <translation>Montrer une notification lorsqu&apos;un message est reçu</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="246"/>
+        <location filename="../bitmessageqt/settings.py" line="341"/>
         <source>Run in Portable Mode</source>
         <translation>Lancer en Mode Portable</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="247"/>
+        <location filename="../bitmessageqt/settings.py" line="339"/>
         <source>In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.</source>
         <translation>En Mode Portable, les messages et les fichiers de configuration sont stockés dans le même dossier que le programme plutôt que le dossier de l&apos;application. Cela rend l&apos;utilisation de Bitmessage plus facile depuis une clé USB.</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="248"/>
+        <location filename="../bitmessageqt/settings.py" line="344"/>
         <source>User Interface</source>
         <translation>Interface utilisateur</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="249"/>
+        <location filename="../bitmessageqt/settings.py" line="345"/>
         <source>Listening port</source>
         <translation>Port d&apos;écoute</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="250"/>
+        <location filename="../bitmessageqt/settings.py" line="346"/>
         <source>Listen for connections on port:</source>
         <translation>Écouter les connexions sur le port :</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="251"/>
+        <location filename="../bitmessageqt/settings.py" line="347"/>
         <source>Proxy server / Tor</source>
         <translation>Serveur proxy / Tor</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="252"/>
+        <location filename="../bitmessageqt/settings.py" line="348"/>
         <source>Type:</source>
         <translation>Type :</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="253"/>
+        <location filename="../bitmessageqt/settings.py" line="349"/>
         <source>none</source>
         <translation>aucun</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="254"/>
+        <location filename="../bitmessageqt/settings.py" line="350"/>
         <source>SOCKS4a</source>
         <translation>SOCKS4a</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="255"/>
+        <location filename="../bitmessageqt/settings.py" line="351"/>
         <source>SOCKS5</source>
         <translation>SOCKS5</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="256"/>
+        <location filename="../bitmessageqt/settings.py" line="352"/>
         <source>Server hostname:</source>
         <translation>Nom du serveur :</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="257"/>
+        <location filename="../bitmessageqt/settings.py" line="371"/>
         <source>Port:</source>
         <translation>Port :</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="258"/>
+        <location filename="../bitmessageqt/settings.py" line="354"/>
         <source>Authentication</source>
         <translation>Authentification</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="259"/>
+        <location filename="../bitmessageqt/settings.py" line="372"/>
         <source>Username:</source>
         <translation>Utilisateur :</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="260"/>
+        <location filename="../bitmessageqt/settings.py" line="356"/>
         <source>Pass:</source>
         <translation>Mot de passe :</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="261"/>
+        <location filename="../bitmessageqt/settings.py" line="358"/>
         <source>Network Settings</source>
         <translation>Paramètres réseau</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="262"/>
+        <location filename="../bitmessageqt/settings.py" line="359"/>
         <source>When someone sends you a message, their computer must first complete some work. The difficulty of this work, by default, is 1. You may raise this default for new addresses you create by changing the values here. Any new addresses you create will require senders to meet the higher difficulty. There is one exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically notify them when you next send a message that they need only complete the minimum amount of work: difficulty 1. </source>
         <translation>Lorsque quelqu&apos;un vous envoie un message, son ordinateur doit d&apos;abord effectuer un travail. La difficulté de ce travail, par défaut, est de 1. Vous pouvez augmenter cette valeur pour les adresses que vous créez en changeant la valeur ici. Chaque nouvelle adresse que vous créez requerra à l&apos;envoyeur de faire face à une difficulté supérieure. Il existe une exception : si vous ajoutez un ami ou une connaissance à votre carnet d&apos;adresses, Bitmessage les notifiera automatiquement lors du prochain message que vous leur envoyez qu&apos;ils ne doivent compléter que la charge de travail minimale : difficulté 1. </translation>
     </message>
     <message>
-        <location filename="../settings.py" line="263"/>
+        <location filename="../bitmessageqt/settings.py" line="360"/>
         <source>Total difficulty:</source>
         <translation>Difficulté totale :</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="264"/>
+        <location filename="../bitmessageqt/settings.py" line="361"/>
         <source>Small message difficulty:</source>
         <translation>Difficulté d&apos;un message court :</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="265"/>
+        <location filename="../bitmessageqt/settings.py" line="362"/>
         <source>The &apos;Small message difficulty&apos; mostly only affects the difficulty of sending small messages. Doubling this value makes it almost twice as difficult to send a small message but doesn&apos;t really affect large messages.</source>
         <translation>La &apos;difficulté d&apos;un message court&apos; affecte principalement la difficulté d&apos;envoyer des messages courts. Doubler cette valeur rend la difficulté à envoyer un court message presque double, tandis qu&apos;un message plus long ne sera pas réellement affecté.</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="266"/>
+        <location filename="../bitmessageqt/settings.py" line="363"/>
         <source>The &apos;Total difficulty&apos; affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work.</source>
         <translation>La &apos;difficulté totale&apos; affecte le montant total de travail que l&apos;envoyeur devra compléter. Doubler cette valeur double la charge de travail.</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="267"/>
+        <location filename="../bitmessageqt/settings.py" line="364"/>
         <source>Demanded difficulty</source>
         <translation>Difficulté demandée</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="268"/>
+        <location filename="../bitmessageqt/settings.py" line="365"/>
         <source>Here you may set the maximum amount of work you are willing to do to send a message to another person. Setting these values to 0 means that any value is acceptable.</source>
         <translation>Vous pouvez préciser quelle charge de travail vous êtes prêt à effectuer afin d&apos;envoyer un message à une personne. Placer cette valeur à 0 signifie que n&apos;importe quelle valeur est acceptée.</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="269"/>
+        <location filename="../bitmessageqt/settings.py" line="366"/>
         <source>Maximum acceptable total difficulty:</source>
         <translation>Difficulté maximale acceptée :</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="270"/>
+        <location filename="../bitmessageqt/settings.py" line="367"/>
         <source>Maximum acceptable small message difficulty:</source>
         <translation>Difficulté maximale pour les messages courts acceptée :</translation>
     </message>
     <message>
-        <location filename="../settings.py" line="271"/>
+        <location filename="../bitmessageqt/settings.py" line="368"/>
         <source>Max acceptable difficulty</source>
         <translation>Difficulté acceptée max</translation>
     </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="342"/>
+        <source>Willingly include unencrypted destination address when sending to a mobile device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="343"/>
+        <source>Override automatic language localization (use countycode or language code, e.g. &apos;en_US&apos; or &apos;en&apos;):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="357"/>
+        <source>Listen for incoming connections when using proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="369"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bitmessage can utilize a different Bitcoin-based program called Namecoin to make addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage address, you can simply tell him to send a message to &lt;span style=&quot; font-style:italic;&quot;&gt;test. &lt;/span&gt;&lt;/p&gt;&lt;p&gt;(Getting your own Bitmessage address into Namecoin is still rather difficult).&lt;/p&gt;&lt;p&gt;Bitmessage can use either namecoind directly or a running nmcontrol instance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="370"/>
+        <source>Host:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="373"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="374"/>
+        <source>Test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="375"/>
+        <source>Connect to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="376"/>
+        <source>Namecoind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="377"/>
+        <source>NMControl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="378"/>
+        <source>Namecoin integration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/translations/bitmessage_ru.pro

@@ -1,30 +1,33 @@
-SOURCES	+= ../addresses.py
+SOURCES	= 	../addresses.py\
-SOURCES += ../bitmessagemain.py
+			../bitmessagemain.py\
-SOURCES += ../class_addressGenerator.py
+			../class_addressGenerator.py\
-SOURCES += ../class_outgoingSynSender.py
+			../class_outgoingSynSender.py\
-SOURCES += ../class_receiveDataThread.py	
+			../class_receiveDataThread.py\
-SOURCES += ../class_sendDataThread.py
+			../class_sendDataThread.py\
-SOURCES += ../class_singleCleaner.py
+			../class_singleCleaner.py\
-SOURCES += ../class_singleListener.py
+			../class_singleListener.py\
-SOURCES += ../class_singleWorker.py
+			../class_singleWorker.py\
-SOURCES += ../class_sqlThread.py
+			../class_sqlThread.py\
-SOURCES += ../helper_bitcoin.py
+			../helper_bitcoin.py\
-SOURCES += ../helper_bootstrap.py
+			../helper_bootstrap.py\
-SOURCES += ../helper_generic.py
+			../helper_generic.py\
-SOURCES += ../helper_inbox.py
+			../helper_inbox.py\
-SOURCES += ../helper_sent.py
+			../helper_sent.py\
-SOURCES += ../helper_startup.py
+			../helper_startup.py\
-SOURCES += ../shared.py
+			../shared.py\
-SOURCES += ../bitmessageqt/__init__.py
+			../bitmessageqt/__init__.py\
-SOURCES += ../bitmessageqt/about.py
+			../bitmessageqt/about.py\
-SOURCES += ../bitmessageqt/bitmessageui.py
+			../bitmessageqt/bitmessageui.py\
-SOURCES += ../bitmessageqt/help.py
+			../bitmessageqt/connect.py\
-SOURCES += ../bitmessageqt/iconglossary.py
+			../bitmessageqt/help.py\
-SOURCES += ../bitmessageqt/newaddressdialog.py
+			../bitmessageqt/iconglossary.py\
-SOURCES += ../bitmessageqt/newchandialog.py
+			../bitmessageqt/newaddressdialog.py\
-SOURCES += ../bitmessageqt/newsubscriptiondialog.py
+			../bitmessageqt/newchandialog.py\
-SOURCES += ../bitmessageqt/regenerateaddresses.py
+			../bitmessageqt/newsubscriptiondialog.py\
-SOURCES += ../bitmessageqt/settings.py
+			../bitmessageqt/regenerateaddresses.py\
-SOURCES += ../bitmessageqt/specialaddressbehavior.py
+			../bitmessageqt/settings.py\
+			../bitmessageqt/specialaddressbehavior.py
 
-TRANSLATIONS	= bitmessage_ru_RU.ts
+			
+TRANSLATIONS	= bitmessage_ru.ts
+CODECFORTR      = UTF-8

src/translations/bitmessage_ru.ts

@@ -1,200 +1,200 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="ru_RU" sourcelanguage="">
+<!DOCTYPE TS><TS version="2.0" language="ru" sourcelanguage="en">
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="84"/>
+        <location filename="../bitmessageqt/__init__.py" line="91"/>
         <source>One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now?</source>
         <translation>Один из Ваших адресов, %1, является устаревшим адресом версии 1. Адреса версии 1 больше не поддерживаются. Хотите ли Вы удалить его сейчас?</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="154"/>
+        <location filename="../bitmessageqt/__init__.py" line="163"/>
         <source>Reply</source>
         <translation>Ответить</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="156"/>
+        <location filename="../bitmessageqt/__init__.py" line="165"/>
         <source>Add sender to your Address Book</source>
         <translation>Добавить отправителя в адресную книгу</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="257"/>
+        <location filename="../bitmessageqt/__init__.py" line="269"/>
         <source>Move to Trash</source>
         <translation>Поместить в корзину</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="160"/>
+        <location filename="../bitmessageqt/__init__.py" line="169"/>
         <source>View HTML code as formatted text</source>
         <translation>Просмотреть HTML код как отформатированный текст</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="162"/>
+        <location filename="../bitmessageqt/__init__.py" line="171"/>
         <source>Save message as...</source>
         <translation>Сохранить сообщение как ...</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="550"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="581"/>
         <source>New</source>
         <translation>Новый адрес</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="280"/>
+        <location filename="../bitmessageqt/__init__.py" line="292"/>
         <source>Enable</source>
         <translation>Включить</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="282"/>
+        <location filename="../bitmessageqt/__init__.py" line="294"/>
         <source>Disable</source>
         <translation>Выключить</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="278"/>
+        <location filename="../bitmessageqt/__init__.py" line="290"/>
         <source>Copy address to clipboard</source>
         <translation>Скопировать адрес в буфер обмена</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="188"/>
+        <location filename="../bitmessageqt/__init__.py" line="200"/>
         <source>Special address behavior...</source>
         <translation>Особое поведение адресов...</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="206"/>
+        <location filename="../bitmessageqt/__init__.py" line="218"/>
         <source>Send message to this address</source>
         <translation>Отправить сообщение на этот адрес</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="210"/>
+        <location filename="../bitmessageqt/__init__.py" line="222"/>
         <source>Subscribe to this address</source>
         <translation>Подписаться на рассылку с этого адреса</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="212"/>
+        <location filename="../bitmessageqt/__init__.py" line="224"/>
         <source>Add New Address</source>
         <translation>Добавить новый адрес</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="276"/>
+        <location filename="../bitmessageqt/__init__.py" line="288"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="259"/>
+        <location filename="../bitmessageqt/__init__.py" line="271"/>
         <source>Copy destination address to clipboard</source>
         <translation>Скопировать адрес отправки в буфер обмена</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="261"/>
+        <location filename="../bitmessageqt/__init__.py" line="273"/>
         <source>Force send</source>
         <translation>Форсировать отправку</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="577"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="608"/>
         <source>Add new entry</source>
         <translation>Добавить новую запись</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="606"/>
+        <location filename="../bitmessageqt/__init__.py" line="632"/>
         <source>Waiting on their encryption key. Will request it again soon.</source>
         <translation>Ожидаем ключ шифрования от Вашего собеседника. Запрос будет повторен через некоторое время.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="609"/>
+        <location filename="../bitmessageqt/__init__.py" line="635"/>
         <source>Encryption key request queued.</source>
         <translation>Запрос ключа шифрования поставлен в очередь.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="612"/>
+        <location filename="../bitmessageqt/__init__.py" line="638"/>
         <source>Queued.</source>
         <translation>В очереди.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="615"/>
+        <location filename="../bitmessageqt/__init__.py" line="641"/>
         <source>Message sent. Waiting on acknowledgement. Sent at %1</source>
         <translation>Сообщение отправлено. Ожидаем подтверждения. Отправлено в %1 </translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="621"/>
+        <location filename="../bitmessageqt/__init__.py" line="647"/>
         <source>Need to do work to send message. Work is queued.</source>
         <translation>Нужно провести требуемые вычисления, чтобы отправить сообщение. Вычисления ожидают очереди.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="624"/>
+        <location filename="../bitmessageqt/__init__.py" line="650"/>
         <source>Acknowledgement of the message received %1</source>
-        <translation>Сообщение доставлено %1</translation>
+        <translation>Сообщение доставлено в %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="627"/>
+        <location filename="../bitmessageqt/__init__.py" line="653"/>
         <source>Broadcast queued.</source>
         <translation>Рассылка ожидает очереди.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="630"/>
+        <location filename="../bitmessageqt/__init__.py" line="656"/>
         <source>Broadcast on %1</source>
         <translation>Рассылка на %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="633"/>
+        <location filename="../bitmessageqt/__init__.py" line="659"/>
         <source>Problem: The work demanded by the recipient is more difficult than you are willing to do. %1</source>
         <translation>Проблема: Ваш получатель требует более сложных вычислений, чем максимум, указанный в Ваших настройках. %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="636"/>
+        <location filename="../bitmessageqt/__init__.py" line="662"/>
         <source>Problem: The recipient&apos;s encryption key is no good. Could not encrypt message. %1</source>
         <translation>Проблема: ключ получателя неправильный. Невозможно зашифровать сообщение. %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="639"/>
+        <location filename="../bitmessageqt/__init__.py" line="665"/>
         <source>Forced difficulty override. Send should start soon.</source>
         <translation>Форсирована смена сложности. Отправляем через некоторое время.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="642"/>
+        <location filename="../bitmessageqt/__init__.py" line="668"/>
         <source>Unknown status: %1 %2</source>
         <translation>Неизвестный статус: %1 %2</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="386"/>
+        <location filename="../bitmessageqt/__init__.py" line="398"/>
         <source>Since startup on %1</source>
-        <translation>С начала работы %1</translation>
+        <translation>С начала работы в %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1284"/>
+        <location filename="../bitmessageqt/__init__.py" line="1351"/>
         <source>Not Connected</source>
         <translation>Не соединено</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="795"/>
+        <location filename="../bitmessageqt/__init__.py" line="821"/>
         <source>Show Bitmessage</source>
         <translation>Показать Bitmessage</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="533"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="564"/>
         <source>Send</source>
-        <translation>Отправка</translation>
+        <translation>Отправить</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="810"/>
+        <location filename="../bitmessageqt/__init__.py" line="836"/>
         <source>Subscribe</source>
         <translation>Подписки</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="574"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="605"/>
         <source>Address Book</source>
         <translation>Адресная книга</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="599"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="630"/>
         <source>Quit</source>
         <translation>Выйти</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1070"/>
+        <location filename="../bitmessageqt/__init__.py" line="1140"/>
         <source>You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file.</source>
         <translation>Вы можете управлять Вашими ключами, отредактировав файл keys.dat, находящийся в той же папке, что и эта программа. 
 Создайте резервную копию этого файла перед тем как будете его редактировать.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1074"/>
+        <location filename="../bitmessageqt/__init__.py" line="1144"/>
         <source>You may manage your keys by editing the keys.dat file stored in
  %1 
 It is important that you back up this file.</source>
@@ -203,19 +203,19 @@ It is important that you back up this file.</source>
 Создайте резервную копию этого файла перед тем как будете его редактировать.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1081"/>
+        <location filename="../bitmessageqt/__init__.py" line="1151"/>
         <source>Open keys.dat?</source>
         <translation>Открыть файл keys.dat?</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1078"/>
+        <location filename="../bitmessageqt/__init__.py" line="1148"/>
         <source>You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)</source>
         <translation>Вы можете управлять Вашими ключами, отредактировав файл keys.dat, находящийся в той же папке, что и эта программа. 
 Создайте резервную копию этого файла перед тем как будете его редактировать. Хотели бы Вы открыть этот файл сейчас? 
 (пожалуйста, закройте Bitmessage до того как Вы внесете в этот файл какие-либо изменения.)</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1081"/>
+        <location filename="../bitmessageqt/__init__.py" line="1151"/>
         <source>You may manage your keys by editing the keys.dat file stored in
  %1 
 It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)</source>
@@ -225,192 +225,192 @@ It is important that you back up this file. Would you like to open the file now?
 (пожалуйста, закройте Bitmessage до того как Вы внесете в этот файл какие-либо изменения.)</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1087"/>
+        <location filename="../bitmessageqt/__init__.py" line="1157"/>
         <source>Delete trash?</source>
         <translation>Очистить корзину?</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1087"/>
+        <location filename="../bitmessageqt/__init__.py" line="1157"/>
         <source>Are you sure you want to delete all trashed messages?</source>
         <translation>Вы уверены, что хотите очистить корзину?</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1098"/>
+        <location filename="../bitmessageqt/__init__.py" line="1168"/>
         <source>bad passphrase</source>
         <translation>Неподходящая секретная фраза</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1098"/>
+        <location filename="../bitmessageqt/__init__.py" line="1168"/>
         <source>You must type your passphrase. If you don&apos;t have one then this is not the form for you.</source>
         <translation>Вы должны ввести секретную фразу. Если Вы не хотите это делать, то Вы выбрали неправильную опцию.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1205"/>
+        <location filename="../bitmessageqt/__init__.py" line="1274"/>
         <source>Processed %1 person-to-person messages.</source>
         <translation>Обработано %1 сообщений.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1210"/>
+        <location filename="../bitmessageqt/__init__.py" line="1278"/>
         <source>Processed %1 broadcast messages.</source>
         <translation>Обработано %1 рассылок.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1215"/>
+        <location filename="../bitmessageqt/__init__.py" line="1282"/>
         <source>Processed %1 public keys.</source>
         <translation>Обработано %1 открытых ключей.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1259"/>
+        <location filename="../bitmessageqt/__init__.py" line="1326"/>
         <source>Total Connections: %1</source>
         <translation>Всего соединений: %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1278"/>
+        <location filename="../bitmessageqt/__init__.py" line="1345"/>
         <source>Connection lost</source>
         <translation>Соединение потеряно</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1319"/>
+        <location filename="../bitmessageqt/__init__.py" line="1386"/>
         <source>Connected</source>
         <translation>Соединено</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1365"/>
+        <location filename="../bitmessageqt/__init__.py" line="1432"/>
         <source>Message trashed</source>
         <translation>Сообщение удалено</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1499"/>
+        <location filename="../bitmessageqt/__init__.py" line="1566"/>
         <source>Error: Bitmessage addresses start with BM-   Please check %1</source>
         <translation>Ошибка: Bitmessage адреса начинаются с BM-   Пожалуйста, проверьте %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1502"/>
+        <location filename="../bitmessageqt/__init__.py" line="1569"/>
         <source>Error: The address %1 is not typed or copied correctly. Please check it.</source>
         <translation>Ошибка: адрес %1 внесен или скопирован неправильно. Пожалуйста, перепроверьте.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1505"/>
+        <location filename="../bitmessageqt/__init__.py" line="1572"/>
         <source>Error: The address %1 contains invalid characters. Please check it.</source>
         <translation>Ошибка: адрес %1 содержит запрещенные символы. Пожалуйста, перепроверьте.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1508"/>
+        <location filename="../bitmessageqt/__init__.py" line="1575"/>
         <source>Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever.</source>
         <translation>Ошибка: версия адреса в %1 слишком новая. Либо Вам нужно обновить Bitmessage, либо Ваш собеседник дал неправильный адрес.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1511"/>
+        <location filename="../bitmessageqt/__init__.py" line="1578"/>
         <source>Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance.</source>
         <translation>Ошибка: некоторые данные, закодированные в адресе %1, слишком короткие. Возможно, что-то не так с программой Вашего собеседника.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1514"/>
+        <location filename="../bitmessageqt/__init__.py" line="1581"/>
         <source>Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance.</source>
         <translation>Ошибка: некоторые данные, закодированные в адресе %1, слишком длинные. Возможно, что-то не так с программой Вашего собеседника.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1517"/>
+        <location filename="../bitmessageqt/__init__.py" line="1584"/>
         <source>Error: Something is wrong with the address %1.</source>
         <translation>Ошибка: что-то не так с адресом %1.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1584"/>
+        <location filename="../bitmessageqt/__init__.py" line="1651"/>
         <source>Error: You must specify a From address. If you don&apos;t have one, go to the &apos;Your Identities&apos; tab.</source>
         <translation>Вы должны указать адрес в поле &quot;От кого&quot;. Вы можете найти Ваш адрес во вкладе &quot;Ваши Адреса&quot;.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1528"/>
+        <location filename="../bitmessageqt/__init__.py" line="1595"/>
         <source>Sending to your address</source>
         <translation>Отправка на Ваш собственный адрес</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1528"/>
+        <location filename="../bitmessageqt/__init__.py" line="1595"/>
         <source>Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.</source>
         <translation>Ошибка: Один из адресов, на который Вы отправляете сообщение, %1, принадлежит Вам. К сожалению, Bitmessage не может отправлять сообщения самому себе. Попробуйте запустить второго клиента на другом компьютере или на виртуальной машине.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1534"/>
+        <location filename="../bitmessageqt/__init__.py" line="1601"/>
         <source>Address version number</source>
         <translation>Версия адреса</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1534"/>
+        <location filename="../bitmessageqt/__init__.py" line="1601"/>
         <source>Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version.</source>
         <translation>По поводу адреса %1: Bitmessage не поддерживаем адреса версии %2. Возможно, Вам нужно обновить клиент Bitmessage.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1538"/>
+        <location filename="../bitmessageqt/__init__.py" line="1605"/>
         <source>Stream number</source>
         <translation>Номер потока</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1538"/>
+        <location filename="../bitmessageqt/__init__.py" line="1605"/>
         <source>Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version.</source>
         <translation>По поводу адреса %1: Bitmessage не поддерживаем стрим номер %2. Возможно, Вам нужно обновить клиент Bitmessage.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1543"/>
+        <location filename="../bitmessageqt/__init__.py" line="1610"/>
         <source>Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won&apos;t send until you connect.</source>
         <translation>Внимание: Вы не подключены к сети. Bitmessage проделает необходимые вычисления, чтобы отправить сообщение, но не отправит его до тех пор, пока Вы не подсоединитесь к сети.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1580"/>
+        <location filename="../bitmessageqt/__init__.py" line="1647"/>
         <source>Your &apos;To&apos; field is empty.</source>
         <translation>Вы не заполнили поле &apos;Кому&apos;.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1635"/>
+        <location filename="../bitmessageqt/__init__.py" line="1702"/>
         <source>Work is queued.</source>
         <translation>Вычисления поставлены в очередь.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1657"/>
+        <location filename="../bitmessageqt/__init__.py" line="1724"/>
         <source>Right click one or more entries in your address book and select &apos;Send message to this address&apos;.</source>
         <translation>Нажмите правую кнопку мышки на каком-либо адресе и выберите &quot;Отправить сообщение на этот адрес&quot;.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1734"/>
+        <location filename="../bitmessageqt/__init__.py" line="1812"/>
         <source>Work is queued. %1</source>
         <translation>Вычисления поставлены в очередь. %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1803"/>
+        <location filename="../bitmessageqt/__init__.py" line="1881"/>
         <source>New Message</source>
         <translation>Новое сообщение</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1803"/>
+        <location filename="../bitmessageqt/__init__.py" line="1881"/>
         <source>From </source>
         <translation>От </translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="3086"/>
+        <location filename="../bitmessageqt/__init__.py" line="3301"/>
         <source>Address is valid.</source>
         <translation>Адрес введен правильно.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2325"/>
+        <location filename="../bitmessageqt/__init__.py" line="2453"/>
         <source>Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.</source>
         <translation>Ошибка: Вы не можете добавлять один и тот же адрес в Адресную Книгу несколько раз. Просто переименуйте существующий адрес.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2141"/>
+        <location filename="../bitmessageqt/__init__.py" line="2243"/>
         <source>The address you entered was invalid. Ignoring it.</source>
         <translation>Вы ввели неправильный адрес. Это адрес проигнорирован.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2495"/>
+        <location filename="../bitmessageqt/__init__.py" line="2623"/>
         <source>Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want.</source>
         <translation>Ошибка: Вы не можете добавлять один и тот же адрес в подписку несколько раз. Просто переименуйте существующую подписку.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1969"/>
+        <location filename="../bitmessageqt/__init__.py" line="2056"/>
         <source>Restart</source>
         <translation>Перезапустить</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1963"/>
+        <location filename="../bitmessageqt/__init__.py" line="2048"/>
         <source>You must restart Bitmessage for the port number change to take effect.</source>
         <translation>Вы должны перезапустить Bitmessage, чтобы смена номера порта имела эффект.</translation>
     </message>
@@ -420,458 +420,501 @@ It is important that you back up this file. Would you like to open the file now?
         <translation type="obsolete">Bitmessage будет использовать Ваш прокси в дальнейшем, тем не менее, мы рекомендуем перезапустить Bitmessage в ручную, чтобы закрыть уже существующие соединения.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2138"/>
+        <location filename="../bitmessageqt/__init__.py" line="2240"/>
         <source>Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want.</source>
         <translation>Ошибка: Вы не можете добавлять один и тот же адрес в список несколько раз. Просто переименуйте существующий адрес.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2191"/>
+        <location filename="../bitmessageqt/__init__.py" line="2293"/>
         <source>Passphrase mismatch</source>
         <translation>Секретная фраза не подходит</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2191"/>
+        <location filename="../bitmessageqt/__init__.py" line="2293"/>
         <source>The passphrase you entered twice doesn&apos;t match. Try again.</source>
         <translation>Вы ввели две разные секретные фразы. Пожалуйста, повторите заново.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2194"/>
+        <location filename="../bitmessageqt/__init__.py" line="2296"/>
         <source>Choose a passphrase</source>
         <translation>Придумайте секретную фразу</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2194"/>
+        <location filename="../bitmessageqt/__init__.py" line="2296"/>
         <source>You really do need a passphrase.</source>
         <translation>Вы действительно должны ввести секретную фразу.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2217"/>
+        <location filename="../bitmessageqt/__init__.py" line="2319"/>
         <source>All done. Closing user interface...</source>
         <translation>Программа завершена. Закрываем пользовательский интерфейс...</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2265"/>
+        <location filename="../bitmessageqt/__init__.py" line="2393"/>
         <source>Address is gone</source>
         <translation>Адрес утерян</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2265"/>
+        <location filename="../bitmessageqt/__init__.py" line="2393"/>
         <source>Bitmessage cannot find your address %1. Perhaps you removed it?</source>
         <translation>Bitmessage не может найти Ваш адрес %1. Возможно Вы удалили его?</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2269"/>
+        <location filename="../bitmessageqt/__init__.py" line="2397"/>
         <source>Address disabled</source>
         <translation>Адрес выключен</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2269"/>
+        <location filename="../bitmessageqt/__init__.py" line="2397"/>
         <source>Error: The address from which you are trying to send is disabled. You&apos;ll have to enable it on the &apos;Your Identities&apos; tab before using it.</source>
         <translation>Ошибка: адрес, с которого Вы пытаетесь отправить, выключен. Вам нужно будет включить этот адрес во вкладке &quot;Ваши адреса&quot;.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2322"/>
+        <location filename="../bitmessageqt/__init__.py" line="2450"/>
         <source>Entry added to the Address Book. Edit the label to your liking.</source>
         <translation>Запись добавлена в Адресную Книгу. Вы можете ее отредактировать.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2387"/>
+        <location filename="../bitmessageqt/__init__.py" line="2515"/>
         <source>Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.</source>
         <translation>Удалено в корзину. Чтобы попасть в корзину, Вам нужно будет найти файл корзины на диске.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2361"/>
+        <location filename="../bitmessageqt/__init__.py" line="2489"/>
         <source>Save As...</source>
         <translation>Сохранить как ...</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2370"/>
+        <location filename="../bitmessageqt/__init__.py" line="2498"/>
         <source>Write error.</source>
         <translation>Ошибка записи.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2481"/>
+        <location filename="../bitmessageqt/__init__.py" line="2609"/>
         <source>No addresses selected.</source>
         <translation>Вы не выбрали адрес.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="2939"/>
+        <location filename="../bitmessageqt/__init__.py" line="3082"/>
         <source>Options have been disabled because they either aren&apos;t applicable or because they haven&apos;t yet been implemented for your operating system.</source>
         <translation>Опции были отключены, потому что ли они либо не подходят, либо еще не выполнены под Вашу операционную систему.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="3068"/>
+        <location filename="../bitmessageqt/__init__.py" line="3283"/>
         <source>The address should start with &apos;&apos;BM-&apos;&apos;</source>
         <translation>Адрес должен начинаться с &quot;BM-&quot;</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="3071"/>
+        <location filename="../bitmessageqt/__init__.py" line="3286"/>
         <source>The address is not typed or copied correctly (the checksum failed).</source>
         <translation>Адрес введен или скопирован неверно (контрольная сумма не сходится).</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="3074"/>
+        <location filename="../bitmessageqt/__init__.py" line="3289"/>
         <source>The version number of this address is higher than this software can support. Please upgrade Bitmessage.</source>
         <translation>Версия этого адреса более поздняя, чем Ваша программа. Пожалуйста, обновите программу Bitmessage.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="3077"/>
+        <location filename="../bitmessageqt/__init__.py" line="3292"/>
         <source>The address contains invalid characters.</source>
         <translation>Адрес содержит запрещенные символы.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="3080"/>
+        <location filename="../bitmessageqt/__init__.py" line="3295"/>
         <source>Some data encoded in the address is too short.</source>
         <translation>Данные, закодированные в адресе, слишком короткие.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="3083"/>
+        <location filename="../bitmessageqt/__init__.py" line="3298"/>
         <source>Some data encoded in the address is too long.</source>
         <translation>Данные, закодированные в адресе, слишком длинные.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="3128"/>
+        <location filename="../bitmessageqt/__init__.py" line="3343"/>
         <source>You are using TCP port %1. (This can be changed in the settings).</source>
         <translation>Вы используете TCP порт %1 (Его можно поменять в настройках).</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="502"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="532"/>
         <source>Bitmessage</source>
         <translation>Bitmessage</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="542"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="573"/>
         <source>To</source>
         <translation>Кому</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="544"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="575"/>
         <source>From</source>
         <translation>От кого</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="546"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="577"/>
         <source>Subject</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="517"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="547"/>
         <source>Received</source>
         <translation>Получено</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="518"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="548"/>
         <source>Inbox</source>
         <translation>Входящие</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="519"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="549"/>
         <source>Load from Address book</source>
         <translation>Взять из адресной книги</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="520"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="551"/>
         <source>Message:</source>
         <translation>Сообщение:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="521"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="552"/>
         <source>Subject:</source>
         <translation>Тема:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="522"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="553"/>
         <source>Send to one or more specific people</source>
         <translation>Отправить одному или нескольким указанным получателям</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="523"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="546"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="528"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="559"/>
         <source>To:</source>
         <translation>Кому:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="529"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="560"/>
         <source>From:</source>
         <translation>От:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="530"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="561"/>
         <source>Broadcast to everyone who is subscribed to your address</source>
         <translation>Рассылка всем, кто подписался на Ваш адрес</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="532"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="563"/>
         <source>Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.</source>
         <translation>Пожалуйста, учитывайте, что рассылки шифруются лишь Вашим адресом. Любой человек, который знает Ваш адрес, сможет прочитать Вашу рассылку.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="548"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="579"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="549"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="580"/>
         <source>Sent</source>
         <translation>Отправленные</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="553"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="584"/>
         <source>Label (not shown to anyone)</source>
-        <translation>Название (не показывается никому)</translation>
+        <translation>Имя (не показывается никому)</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="582"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="613"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="557"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="588"/>
         <source>Stream</source>
         <translation>Поток</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="558"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="589"/>
         <source>Your Identities</source>
         <translation>Ваши Адреса</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="559"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="590"/>
         <source>Here you can subscribe to &apos;broadcast messages&apos; that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab.</source>
         <translation>Здесь Вы можете подписаться на рассылки от других пользователей. Все рассылки будут появляться у Вас во Входящих. Вы будете следить за всеми адресами, указанными здесь, даже если они в черном списке.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="560"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="591"/>
         <source>Add new Subscription</source>
         <translation>Добавить новую подписку</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="563"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="594"/>
         <source>Label</source>
-        <translation>Название</translation>
+        <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="566"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="597"/>
         <source>Subscriptions</source>
         <translation>Подписки</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="567"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="598"/>
         <source>The Address book is useful for adding names or labels to other people&apos;s Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the &apos;Add&apos; button, or from your inbox by right-clicking on a message.</source>
         <translation>Адресная книга удобна для присвоения осмысленных имен Bitmessage адресам Ваших друзей. Вы можете добавлять новые записи с помощью кнопки &quot;Добавить новую запись&quot;, или же правым кликом мышки на сообщении.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="580"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="611"/>
         <source>Name or Label</source>
-        <translation>Название</translation>
+        <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="575"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="606"/>
         <source>Use a Blacklist (Allow all incoming messages except those on the Blacklist)</source>
         <translation>Использовать черный список (Разрешить все входящие сообщения, кроме указанных в черном списке)</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="576"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="607"/>
         <source>Use a Whitelist (Block all incoming messages except those on the Whitelist)</source>
         <translation>Использовать белый список (блокировать все входящие сообщения, кроме указанных в белом списке)</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="583"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="614"/>
         <source>Blacklist</source>
         <translation>Черный список</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="585"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="616"/>
         <source>Stream #</source>
         <translation>№ потока</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="587"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="618"/>
         <source>Connections</source>
         <translation>Соединений</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="588"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="619"/>
         <source>Total connections: 0</source>
         <translation>Всего соединений: 0</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="589"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="620"/>
         <source>Since startup at asdf:</source>
         <translation>С начала работы программы в asdf:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="590"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="621"/>
         <source>Processed 0 person-to-person message.</source>
         <translation>Обработано 0 сообщений.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="591"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="622"/>
         <source>Processed 0 public key.</source>
         <translation>Обработано 0 открытых ключей.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="592"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="623"/>
         <source>Processed 0 broadcast.</source>
         <translation>Обработано 0 рассылок.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="593"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="624"/>
         <source>Network Status</source>
         <translation>Статус сети</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="594"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="625"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="602"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="635"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="600"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="632"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="597"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="628"/>
         <source>Import keys</source>
         <translation>Импортировать ключи</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="598"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="629"/>
         <source>Manage keys</source>
         <translation>Управлять ключами</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="601"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="634"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="603"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="636"/>
         <source>Regenerate deterministic addresses</source>
         <translation>Сгенерировать заново все адреса</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="604"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="637"/>
         <source>Delete all trashed messages</source>
         <translation>Стереть все сообщения из корзины</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="618"/>
+        <location filename="../bitmessageqt/__init__.py" line="644"/>
         <source>Message sent. Sent at %1</source>
         <translation>Сообщение отправлено в %1</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1137"/>
+        <location filename="../bitmessageqt/__init__.py" line="1207"/>
         <source>Chan name needed</source>
         <translation>Требуется имя chan-а</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1137"/>
+        <location filename="../bitmessageqt/__init__.py" line="1207"/>
         <source>You didn&apos;t enter a chan name.</source>
         <translation>Вы не ввели имя chan-a.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1157"/>
+        <location filename="../bitmessageqt/__init__.py" line="1227"/>
         <source>Address already present</source>
         <translation>Адрес уже существует</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1157"/>
+        <location filename="../bitmessageqt/__init__.py" line="1227"/>
         <source>Could not add chan because it appears to already be one of your identities.</source>
         <translation>Не могу добавить chan, потому что это один из Ваших уже существующих адресов.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1162"/>
+        <location filename="../bitmessageqt/__init__.py" line="1232"/>
         <source>Success</source>
         <translation>Отлично</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1132"/>
+        <location filename="../bitmessageqt/__init__.py" line="1202"/>
         <source>Successfully created chan. To let others join your chan, give them the chan name and this Bitmessage address: %1. This address also appears in &apos;Your Identities&apos;.</source>
         <translation>Chan был успешно создан. Чтобы добавить других в сhan, сообщите им имя chan-а и этот Bitmessage адрес: %1. Этот адрес также отображается во вкладке &quot;Ваши Адреса&quot;.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1141"/>
+        <location filename="../bitmessageqt/__init__.py" line="1211"/>
         <source>Address too new</source>
         <translation>Адрес слишком новый</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1141"/>
+        <location filename="../bitmessageqt/__init__.py" line="1211"/>
         <source>Although that Bitmessage address might be valid, its version number is too new for us to handle. Perhaps you need to upgrade Bitmessage.</source>
         <translation>Этот Bitmessage адрес похож на правильный, но его версия этого адреса слишком новая. Возможно, Вам необходимо обновить программу Bitmessage.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1145"/>
+        <location filename="../bitmessageqt/__init__.py" line="1215"/>
         <source>Address invalid</source>
         <translation>Неправильный адрес</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1145"/>
+        <location filename="../bitmessageqt/__init__.py" line="1215"/>
         <source>That Bitmessage address is not valid.</source>
         <translation>Этот Bitmessage адрес введен неправильно.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1153"/>
+        <location filename="../bitmessageqt/__init__.py" line="1223"/>
         <source>Address does not match chan name</source>
         <translation>Адрес не сходится с именем chan-а</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1153"/>
+        <location filename="../bitmessageqt/__init__.py" line="1223"/>
         <source>Although the Bitmessage address you entered was valid, it doesn&apos;t match the chan name.</source>
         <translation>Вы ввели верный адрес Bitmessage, но он не сходится с именем chan-а.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1162"/>
+        <location filename="../bitmessageqt/__init__.py" line="1232"/>
         <source>Successfully joined chan. </source>
         <translation>Успешно присоединились к chan-у.  </translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="1969"/>
+        <location filename="../bitmessageqt/__init__.py" line="2056"/>
         <source>Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any).</source>
         <translation>Bitmessage будет использовать Ваш прокси, начиная прямо сейчас. Тем не менее Вам имеет смысл перезапустить Bitmessage, чтобы закрыть уже существующие соединения.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="3049"/>
+        <location filename="../bitmessageqt/__init__.py" line="3264"/>
         <source>This is a chan address. You cannot use it as a pseudo-mailing list.</source>
         <translation>Это адрес chan-а. Вы не можете его использовать как адрес рассылки.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="534"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="565"/>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="535"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="566"/>
         <source>All</source>
-        <translation>Всем</translation>
+        <translation>По всем полям</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="539"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="570"/>
         <source>Message</source>
         <translation>Текст сообщения</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/bitmessageui.py" line="605"/>
+        <location filename="../bitmessageqt/bitmessageui.py" line="638"/>
         <source>Join / Create chan</source>
         <translation>Подсоединиться или создать chan</translation>
     </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="173"/>
+        <source>Mark Unread</source>
+        <translation>Отметить как непрочитанное</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1735"/>
+        <source>Fetched address from namecoin identity.</source>
+        <translation>Получить адрес через Namecoin.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3223"/>
+        <source>Testing...</source>
+        <translation>Проверяем...</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="550"/>
+        <source>Fetch Namecoin ID</source>
+        <translation>Получить Namecoin ID</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="631"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="633"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="554"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
 </context>
 <context>
     <name>NewAddressDialog</name>
@@ -949,7 +992,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="188"/>
         <source>Label (not shown to anyone except you)</source>
-        <translation>Название (не показывается никому кроме Вас)</translation>
+        <translation>Имя (не показывается никому кроме Вас)</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="189"/>
@@ -1025,7 +1068,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <message>
         <location filename="../bitmessageqt/newsubscriptiondialog.py" line="58"/>
         <source>Label</source>
-        <translation>Название</translation>
+        <translation>Имя</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newsubscriptiondialog.py" line="59"/>
@@ -1094,6 +1137,29 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
         <translation>Это бета версия программы.</translation>
     </message>
 </context>
+<context>
+    <name>connectDialog</name>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="56"/>
+        <source>Bitmessage</source>
+        <translation>Bitmessage</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="57"/>
+        <source>Bitmessage won&apos;t connect to anyone until you let it. </source>
+        <translation>Bitmessage не будет соединяться ни с кем, пока Вы не разрешите.</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="58"/>
+        <source>Connect now</source>
+        <translation>Соединиться прямо сейчас</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="59"/>
+        <source>Let me configure special network settings first</source>
+        <translation>Я хочу сперва настроить сетевые настройки</translation>
+    </message>
+</context>
 <context>
     <name>helpDialog</name>
     <message>
@@ -1143,45 +1209,50 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
 <context>
     <name>newChanDialog</name>
     <message>
-        <location filename="../bitmessageqt/newchandialog.py" line="92"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="97"/>
         <source>Dialog</source>
         <translation>Новый chan</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/newchandialog.py" line="93"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="98"/>
         <source>Create a new chan</source>
         <translation>Создать новый chan</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/newchandialog.py" line="98"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="103"/>
         <source>Join a chan</source>
         <translation>Присоединиться к chan</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/newchandialog.py" line="95"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="100"/>
         <source>Create a chan</source>
         <translation>Создать chan</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newchandialog.py" line="96"/>
         <source>Enter a name for your chan. If you choose a sufficiently complex chan name (like a strong and unique passphrase) and none of your friends share it publicly then the chan will be secure and private.</source>
-        <translation>Введите имя Вашего chan-a. Если Вы выберете достаточно сложное имя для chan-а (например, сложную и необычную секретную фразу) и никто из Ваших друзей не опубликует эту фразу, то Вам chan будет надежно зашифрован.</translation>
+        <translation type="obsolete">Введите имя Вашего chan-a. Если Вы выберете достаточно сложное имя для chan-а (например, сложную и необычную секретную фразу) и никто из Ваших друзей не опубликует эту фразу, то Вам chan будет надежно зашифрован.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/newchandialog.py" line="100"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="105"/>
         <source>Chan name:</source>
         <translation>Имя chan:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/newchandialog.py" line="99"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="104"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A chan exists when a group of people share the same decryption keys. The keys and bitmessage address used by a chan are generated from a human-friendly word or phrase (the chan name). To send a message to everyone in the chan, send a normal person-to-person message to the chan address.&lt;/p&gt;&lt;p&gt;Chans are experimental and completely unmoderatable.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chan - это способ общения, когда набор ключей шифрования известен сразу целой группе людей. Ключи и Bitmessage-адрес, используемый chan-ом, генерируется из слова или фразы (имя chan-а). Чтобы отправить сообщение всем, находящимся в chan-е, отправьте обычное приватное сообщения на адрес chan-a.&lt;/p&gt;&lt;p&gt;Chan-ы - это экспериментальная фича.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/newchandialog.py" line="101"/>
+        <location filename="../bitmessageqt/newchandialog.py" line="106"/>
         <source>Chan bitmessage address:</source>
         <translation>Bitmessage адрес chan:</translation>
     </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="101"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a name for your chan. If you choose a sufficiently complex chan name (like a strong and unique passphrase) and none of your friends share it publicly then the chan will be secure and private. If you and someone else both create a chan with the same chan name then it is currently very likely that they will be the same chan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Введите имя Вашего chan-a. Если Вы выберете достаточно сложное имя для chan-а (например, сложную и необычную секретную фразу) и никто из Ваших друзей не опубликует эту фразу, то Вам chan будет надежно зашифрован. Если Вы и кто-то другой независимо создадите chan с полностью идентичным именем, то скорее всего Вы получите в итоге один и тот же chan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
 </context>
 <context>
     <name>regenerateAddressesDialog</name>
@@ -1244,164 +1315,268 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
 <context>
     <name>settingsDialog</name>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="254"/>
+        <location filename="../bitmessageqt/settings.py" line="339"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="255"/>
+        <location filename="../bitmessageqt/settings.py" line="341"/>
         <source>Start Bitmessage on user login</source>
         <translation>Запускать Bitmessage при входе в систему</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="256"/>
+        <location filename="../bitmessageqt/settings.py" line="344"/>
         <source>Start Bitmessage in the tray (don&apos;t show main window)</source>
         <translation>Запускать Bitmessage в свернутом виде (не показывать главное окно)</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="257"/>
+        <location filename="../bitmessageqt/settings.py" line="340"/>
         <source>Minimize to tray</source>
         <translation>Сворачивать в трей</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="258"/>
+        <location filename="../bitmessageqt/settings.py" line="342"/>
         <source>Show notification when message received</source>
         <translation>Показывать уведомления при получении новых сообщений</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="259"/>
+        <location filename="../bitmessageqt/settings.py" line="343"/>
         <source>Run in Portable Mode</source>
         <translation>Запустить в переносном режиме</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="260"/>
+        <location filename="../bitmessageqt/settings.py" line="345"/>
         <source>In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.</source>
         <translation>В переносном режиме, все сообщения и конфигурационные файлы сохраняются в той же самой папке что и сама программа. Это делает более удобным использование Bitmessage с USB-флэшки.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="261"/>
+        <location filename="../bitmessageqt/settings.py" line="357"/>
         <source>User Interface</source>
         <translation>Пользовательские</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="262"/>
+        <location filename="../bitmessageqt/settings.py" line="358"/>
         <source>Listening port</source>
         <translation>Порт прослушивания</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="263"/>
+        <location filename="../bitmessageqt/settings.py" line="359"/>
         <source>Listen for connections on port:</source>
         <translation>Прослушивать соединения на порту:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="264"/>
+        <location filename="../bitmessageqt/settings.py" line="360"/>
         <source>Proxy server / Tor</source>
         <translation>Прокси сервер / Tor</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="265"/>
+        <location filename="../bitmessageqt/settings.py" line="361"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="266"/>
+        <location filename="../bitmessageqt/settings.py" line="362"/>
         <source>none</source>
         <translation>отсутствует</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="267"/>
+        <location filename="../bitmessageqt/settings.py" line="363"/>
         <source>SOCKS4a</source>
         <translation>SOCKS4a</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="268"/>
+        <location filename="../bitmessageqt/settings.py" line="364"/>
         <source>SOCKS5</source>
         <translation>SOCKS5</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="269"/>
+        <location filename="../bitmessageqt/settings.py" line="365"/>
         <source>Server hostname:</source>
         <translation>Адрес сервера:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="270"/>
+        <location filename="../bitmessageqt/settings.py" line="384"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="271"/>
+        <location filename="../bitmessageqt/settings.py" line="367"/>
         <source>Authentication</source>
         <translation>Авторизация</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="272"/>
+        <location filename="../bitmessageqt/settings.py" line="385"/>
         <source>Username:</source>
         <translation>Имя пользователя:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="273"/>
+        <location filename="../bitmessageqt/settings.py" line="369"/>
         <source>Pass:</source>
         <translation>Прль:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="275"/>
+        <location filename="../bitmessageqt/settings.py" line="371"/>
         <source>Network Settings</source>
         <translation>Сетевые настройки</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="276"/>
+        <location filename="../bitmessageqt/settings.py" line="372"/>
         <source>When someone sends you a message, their computer must first complete some work. The difficulty of this work, by default, is 1. You may raise this default for new addresses you create by changing the values here. Any new addresses you create will require senders to meet the higher difficulty. There is one exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically notify them when you next send a message that they need only complete the minimum amount of work: difficulty 1. </source>
         <translation>Когда кто-либо отправляет Вам сообщение, его компьютер должен сперва решить определенную вычислительную задачу. Сложность этой задачи по умолчанию равна 1. Вы можете повысить эту сложность для новых адресов, которые Вы создадите, здесь. Таким образом, любые новые адреса, которые Вы создадите, могут требовать от отправителей сложность большую чем 1. Однако, есть одно исключение: если Вы специально добавите Вашего собеседника в адресную книгу, то Bitmessage автоматически уведомит его о том, что для него минимальная сложность будет составлять всегда всего лишь 1.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="277"/>
+        <location filename="../bitmessageqt/settings.py" line="373"/>
         <source>Total difficulty:</source>
         <translation>Общая сложность:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="278"/>
+        <location filename="../bitmessageqt/settings.py" line="374"/>
         <source>Small message difficulty:</source>
         <translation>Сложность для маленьких сообщений:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="279"/>
+        <location filename="../bitmessageqt/settings.py" line="375"/>
         <source>The &apos;Small message difficulty&apos; mostly only affects the difficulty of sending small messages. Doubling this value makes it almost twice as difficult to send a small message but doesn&apos;t really affect large messages.</source>
         <translation>&quot;Сложность для маленьких сообщений&quot; влияет исключительно на небольшие сообщения. Увеличив это число в два раза, вы сделаете отправку маленьких сообщений в два раза сложнее, в то время как сложность отправки больших сообщений не изменится.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="280"/>
+        <location filename="../bitmessageqt/settings.py" line="376"/>
         <source>The &apos;Total difficulty&apos; affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work.</source>
         <translation>&quot;Общая сложность&quot; влияет на абсолютное количество вычислений, которые отправитель должен провести, чтобы отправить сообщение. Увеличив это число в два раза, вы увеличите в два раза объем требуемых вычислений.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="281"/>
+        <location filename="../bitmessageqt/settings.py" line="377"/>
         <source>Demanded difficulty</source>
         <translation>Требуемая сложность</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="282"/>
+        <location filename="../bitmessageqt/settings.py" line="378"/>
         <source>Here you may set the maximum amount of work you are willing to do to send a message to another person. Setting these values to 0 means that any value is acceptable.</source>
         <translation>Здесь Вы можете установить максимальную вычислительную работу, которую Вы согласны проделать, чтобы отправить сообщение другому пользователю. Ноль означает, чтобы любое значение допустимо.</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="283"/>
+        <location filename="../bitmessageqt/settings.py" line="379"/>
         <source>Maximum acceptable total difficulty:</source>
         <translation>Макс допустимая общая сложность:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="284"/>
+        <location filename="../bitmessageqt/settings.py" line="380"/>
         <source>Maximum acceptable small message difficulty:</source>
         <translation>Макс допустимая сложность для маленький сообщений:</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="285"/>
+        <location filename="../bitmessageqt/settings.py" line="381"/>
         <source>Max acceptable difficulty</source>
         <translation>Макс допустимая сложность</translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/settings.py" line="274"/>
+        <location filename="../bitmessageqt/settings.py" line="370"/>
         <source>Listen for incoming connections when using proxy</source>
         <translation>Прослушивать входящие соединения если используется прокси</translation>
     </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="346"/>
+        <source>Willingly include unencrypted destination address when sending to a mobile device</source>
+        <translation>Специально прикреплять незашифрованный адрес получателя, когда посылаем на мобильное устройство</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="382"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bitmessage can utilize a different Bitcoin-based program called Namecoin to make addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage address, you can simply tell him to send a message to &lt;span style=&quot; font-style:italic;&quot;&gt;test. &lt;/span&gt;&lt;/p&gt;&lt;p&gt;(Getting your own Bitmessage address into Namecoin is still rather difficult).&lt;/p&gt;&lt;p&gt;Bitmessage can use either namecoind directly or a running nmcontrol instance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bitmessage умеет пользоваться программой Namecoin для того, чтобы сделать адреса более дружественными для пользователей. Например, вместо того, чтобы диктовать Вашему другу длинный и нудный адрес Bitmessage, Вы можете попросить его отправить сообщение на адрес вида &lt;span style=&quot; font-style:italic;&quot;&gt;test. &lt;/span&gt;&lt;/p&gt;&lt;p&gt;(Перенести Ваш Bitmessage адрес в Namecoin по-прежнему пока довольно сложно).&lt;/p&gt;&lt;p&gt;Bitmessage может использовать либо прямо namecoind, либо уже запущенную программу nmcontrol.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="383"/>
+        <source>Host:</source>
+        <translation>Адрес:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="386"/>
+        <source>Password:</source>
+        <translation>Пароль:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="387"/>
+        <source>Test</source>
+        <translation>Проверить</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="388"/>
+        <source>Connect to:</source>
+        <translation>Подсоединиться к:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="389"/>
+        <source>Namecoind</source>
+        <translation>Namecoind</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="390"/>
+        <source>NMControl</source>
+        <translation>NMControl</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="391"/>
+        <source>Namecoin integration</source>
+        <translation>Интеграция с Namecoin</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="347"/>
+        <source>Interface Language</source>
+        <translation>Язык интерфейса</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="348"/>
+        <source>System Settings</source>
+        <comment>system</comment>
+        <translation>Язык по умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="349"/>
+        <source>English</source>
+        <comment>en</comment>
+        <translation>English</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="350"/>
+        <source>Esperanto</source>
+        <comment>eo</comment>
+        <translation>Esperanto</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="351"/>
+        <source>Fran&#xc3;&#xa7;ais</source>
+        <comment>fr</comment>
+        <translation>Francais</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="352"/>
+        <source>Deutsch</source>
+        <comment>de</comment>
+        <translation>Deutsch</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="353"/>
+        <source>Espa&#xc3;&#xb1;ol</source>
+        <comment>es</comment>
+        <translation>Espanol</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="354"/>
+        <source>&#xd0;&#xa0;&#xd1;&#x83;&#xd1;&#x81;&#xd1;&#x81;&#xd0;&#xba;&#xd0;&#xb8;&#xd0;&#xb9;</source>
+        <comment>ru</comment>
+        <translation>Русский</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="355"/>
+        <source>Pirate English</source>
+        <comment>en_pirate</comment>
+        <translation>Pirate English</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="356"/>
+        <source>Other (set in keys.dat)</source>
+        <comment>other</comment>
+        <translation>Другие (настроено в keys.dat)</translation>
+    </message>
 </context>
 </TS>