From 648750ef5c6e5f7d7b443a9ebfc1cfe986ffb8ee Mon Sep 17 00:00:00 2001
From: coolbeans7 <andrew.broadway@gmail.com>
Date: Fri, 24 Jan 2014 08:16:28 -0800
Subject: [PATCH 01/20] Updated Install.md

Noticed a few typos
---
 INSTALL.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 0d7b6c61..111db5d9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -68,8 +68,8 @@ cd PyBitmessage && python src/bitmessagemain.py
 ```
 
 ##Creating a package for installation
-If you really want, you can make a package for PyBitmessage which you may
-install yourself or distribute to friends. This isn't reccomended, since
+If you really want, you can make a package for PyBitmessage, which you may
+install yourself or distribute to friends. This isn't recommended, since
 PyBitmessage is in Beta, and subject to frequent change.
 
 ####Linux
@@ -78,7 +78,7 @@ First off, since PyBitmessage uses something nifty called
 [packagemonkey](https://github.com/fuzzgun/packagemonkey), go ahead and get
 that installed. You may have to build it from source.
 
-Next, edit the generate.sh script. To your liking.
+Next, edit the generate.sh script to your liking.
 
 Now, run the appropriate script for the type of package you'd like to make
 ```

From ab49956759e11eddb890b8d26a2b8be6b53d1fd2 Mon Sep 17 00:00:00 2001
From: coolbeans7 <andrew.broadway@gmail.com>
Date: Fri, 24 Jan 2014 08:17:50 -0800
Subject: [PATCH 02/20] Update README.md

Just a typo
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c725c3bc..73b5329c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ PyBitmessage
 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
+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.

From 0e310849ca639585568885891b878f4df9050dc7 Mon Sep 17 00:00:00 2001
From: coolbeans7 <andrew.broadway@gmail.com>
Date: Fri, 24 Jan 2014 08:19:29 -0800
Subject: [PATCH 03/20] Update arch.sh

Sentence cased some comments
---
 arch.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch.sh b/arch.sh
index e025ddcf..64c903a7 100755
--- a/arch.sh
+++ b/arch.sh
@@ -24,14 +24,14 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
 make clean
 rm -f archpackage/*.gz
 
-# having the root directory called name-version seems essential
+# Having the root directory called name-version seems essential
 mv ../${APP} ../${APP}-${VERSION}
 tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
 
-# rename the root directory without the version number
+# Rename the root directory without the version number
 mv ../${APP}-${VERSION} ../${APP}
 
-# calculate the MD5 checksum
+# Calculate the MD5 checksum
 CHECKSM=$(md5sum ${SOURCE})
 sed -i "s/md5sums[^)]*)/md5sums=(${CHECKSM%% *})/g" archpackage/PKGBUILD
 

From d9c60d8e5f6fa98f1a3eb3e33362d21c81c1d290 Mon Sep 17 00:00:00 2001
From: coolbeans7 <andrew.broadway@gmail.com>
Date: Fri, 24 Jan 2014 08:20:28 -0800
Subject: [PATCH 04/20] Update debian.sh

Sentence cased some comments, capitalized a noun
---
 debian.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian.sh b/debian.sh
index d80d9db9..0cb07fff 100755
--- a/debian.sh
+++ b/debian.sh
@@ -29,7 +29,7 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
 make clean
 make
 
-# change the parent directory name to debian format
+# Change the parent directory name to Debian format
 mv ../${APP} ../${DIR}
 
 # Create a source archive
@@ -38,9 +38,9 @@ make source
 # Build the package
 dpkg-buildpackage -F
 
-# sign files
+# Sign files
 gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb
 gpg -ba ../${APP}_${VERSION}.orig.tar.gz
 
-# restore the parent directory name
+# Restore the parent directory name
 mv ../${DIR} ../${APP}

From 525a6ec58b6aacdbabca93e92626f9854460ba59 Mon Sep 17 00:00:00 2001
From: coolbeans7 <andrew.broadway@gmail.com>
Date: Fri, 24 Jan 2014 08:21:01 -0800
Subject: [PATCH 05/20] Update ebuild.sh

Sentence cased other comments
---
 ebuild.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebuild.sh b/ebuild.sh
index 59295718..e5550355 100755
--- a/ebuild.sh
+++ b/ebuild.sh
@@ -21,13 +21,13 @@ sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs
 sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
 sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
 
-# create the source code in the SOURCES directory
+# Create the source code in the SOURCES directory
 make clean
 mkdir -p ~/ebuild
 rm -f ${SOURCE}
 mv ../${APP} ../${APP}-${VERSION}
 tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
 
-# rename the root directory without the version number
+# Rename the root directory without the version number
 mv ../${APP}-${VERSION} ../${APP}
 

From e133b907691fa5bfbd1bea7f3af06d53b52e09fe Mon Sep 17 00:00:00 2001
From: coolbeans7 <andrew.broadway@gmail.com>
Date: Fri, 24 Jan 2014 08:22:01 -0800
Subject: [PATCH 06/20] Update rpm.sh

A bit more sentence casing.
---
 rpm.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rpm.sh b/rpm.sh
index 074a4515..9b67ba61 100755
--- a/rpm.sh
+++ b/rpm.sh
@@ -24,25 +24,25 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
 sudo yum groupinstall "Development Tools"
 sudo yum install rpmdevtools
 
-# setup the rpmbuild directory tree
+# Setup the rpmbuild directory tree
 rpmdev-setuptree
 
-# create the source code in the SOURCES directory
+# Create the source code in the SOURCES directory
 make clean
 mkdir -p ~/rpmbuild/SOURCES
 rm -f ${SOURCE}
 
-# having the root directory called name-version seems essential
+# Having the root directory called name-version seems essential
 mv ../${APP} ../${APP}-${VERSION}
 tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
 
-# rename the root directory without the version number
+# Rename the root directory without the version number
 mv ../${APP}-${VERSION} ../${APP}
 
-# copy the spec file into the SPECS directory
+# Copy the spec file into the SPECS directory
 cp -f rpmpackage/${APP}.spec ~/rpmbuild/SPECS
 
-# build
+# Build
 cd ~/rpmbuild/SPECS
 rpmbuild -ba ${APP}.spec
 cd ${CURRDIR}

From 5c1e1206ef0e7f288cccc64dd8cc0b6ff0f37d67 Mon Sep 17 00:00:00 2001
From: Daniel Kraft <d@domob.eu>
Date: Tue, 28 Jan 2014 20:32:16 +0100
Subject: [PATCH 07/20] Use patch for email-like quoting with '>' chars.

Apply the patch from https://github.com/Bitmessage/PyBitmessage/pull/271
for email-like "reply below text" with '>' quoting.  The patch is
slightly modified compared to the referenced pull request.
---
 src/bitmessageqt/__init__.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 7125cb60..3d5180f6 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -34,6 +34,7 @@ import hashlib
 from pyelliptic.openssl import OpenSSL
 import pickle
 import platform
+import textwrap
 import debug
 from debug import logger
 import subprocess
@@ -2613,6 +2614,25 @@ class MyForm(QtGui.QMainWindow):
         # We could also select upwards, but then our problem would be with the topmost message.
         # self.ui.tableWidgetInbox.clearSelection() manages to mark the message as read again.
 
+    # Format predefined text on message reply.
+    def quoted_text(self, message):
+        quoteWrapper = textwrap.TextWrapper(replace_whitespace = False,
+                                            initial_indent = '> ',
+                                            subsequent_indent = '> ',
+                                            break_long_words = False,
+                                            break_on_hyphens = False)
+        def quote_line(line):
+            # Do quote empty lines.
+            if line == '' or line.isspace():
+                return '> '
+            # Quote already quoted lines, but do not wrap them.
+            elif line[0:2] == '> ':
+                return '> ' + line
+            # Wrap and quote lines/paragraphs new to this message.
+            else:
+                return quoteWrapper.fill(line)
+        return '\n'.join([quote_line(l) for l in message.splitlines()]) + '\n\n'
+
     def on_action_InboxReply(self):
         currentInboxRow = self.ui.tableWidgetInbox.currentRow()
         toAddressAtCurrentInboxRow = str(self.ui.tableWidgetInbox.item(
@@ -2655,7 +2675,9 @@ class MyForm(QtGui.QMainWindow):
         else:
             self.ui.comboBoxSendFrom.setCurrentIndex(0)
         
-        self.ui.textEditMessage.setText('\n\n------------------------------------------------------\n' + unicode(messageAtCurrentInboxRow, 'utf-8)'))
+        #self.ui.textEditMessage.setText('\n\n------------------------------------------------------\n' + unicode(messageAtCurrentInboxRow, 'utf-8)'))
+        quotedText = self.quoted_text(unicode(messageAtCurrentInboxRow, 'utf-8'))
+        self.ui.textEditMessage.setText(quotedText)
         if self.ui.tableWidgetInbox.item(currentInboxRow, 2).text()[0:3] in ['Re:', 'RE:']:
             self.ui.lineEditSubject.setText(
                 self.ui.tableWidgetInbox.item(currentInboxRow, 2).text())

From 6326147d6ff4e42c4787be4966c11dd0a346b5f5 Mon Sep 17 00:00:00 2001
From: Daniel Kraft <d@domob.eu>
Date: Tue, 28 Jan 2014 20:57:01 +0100
Subject: [PATCH 08/20] Make reply below quote opt-in.

Add a new preference for 'reply below quote' and only use the new
quoting style if it is set.
---
 src/bitmessageqt/__init__.py |   8 +-
 src/bitmessageqt/settings.py | 147 +++++++++++++++++------------------
 src/bitmessageqt/settings.ui |   9 ++-
 src/helper_startup.py        |   3 +-
 4 files changed, 88 insertions(+), 79 deletions(-)

diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 3d5180f6..c33a60b5 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -2251,6 +2251,8 @@ class MyForm(QtGui.QMainWindow):
                 self.settingsDialogInstance.ui.checkBoxWillinglySendToMobile.isChecked()))
             shared.config.set('bitmessagesettings', 'useidenticons', str(
                 self.settingsDialogInstance.ui.checkBoxUseIdenticons.isChecked()))
+            shared.config.set('bitmessagesettings', 'replybelow', str(
+                self.settingsDialogInstance.ui.checkBoxReplyBelow.isChecked()))
                 
             lang_ind = int(self.settingsDialogInstance.ui.languageComboBox.currentIndex())
             if not languages[lang_ind] == 'other':
@@ -2616,6 +2618,9 @@ class MyForm(QtGui.QMainWindow):
 
     # Format predefined text on message reply.
     def quoted_text(self, message):
+        if not shared.safeConfigGetBoolean('bitmessagesettings', 'replybelow'):
+          return '\n\n------------------------------------------------------\n' + message
+
         quoteWrapper = textwrap.TextWrapper(replace_whitespace = False,
                                             initial_indent = '> ',
                                             subsequent_indent = '> ',
@@ -2675,7 +2680,6 @@ class MyForm(QtGui.QMainWindow):
         else:
             self.ui.comboBoxSendFrom.setCurrentIndex(0)
         
-        #self.ui.textEditMessage.setText('\n\n------------------------------------------------------\n' + unicode(messageAtCurrentInboxRow, 'utf-8)'))
         quotedText = self.quoted_text(unicode(messageAtCurrentInboxRow, 'utf-8'))
         self.ui.textEditMessage.setText(quotedText)
         if self.ui.tableWidgetInbox.item(currentInboxRow, 2).text()[0:3] in ['Re:', 'RE:']:
@@ -3340,6 +3344,8 @@ class settingsDialog(QtGui.QDialog):
             shared.safeConfigGetBoolean('bitmessagesettings', 'willinglysendtomobile'))
         self.ui.checkBoxUseIdenticons.setChecked(
             shared.safeConfigGetBoolean('bitmessagesettings', 'useidenticons'))
+        self.ui.checkBoxReplyBelow.setChecked(
+            shared.safeConfigGetBoolean('bitmessagesettings', 'replybelow'))
         
         global languages 
         languages = ['system','en','eo','fr','de','es','ru','no','ar','zh_cn','en_pirate','other']
diff --git a/src/bitmessageqt/settings.py b/src/bitmessageqt/settings.py
index 293c133b..a79976cd 100644
--- a/src/bitmessageqt/settings.py
+++ b/src/bitmessageqt/settings.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'settings.ui'
 #
-# Created: Mon Jan 20 14:26:31 2014
-#      by: PyQt4 UI code generator 4.10.3
+# Created: Tue Jan 28 20:46:24 2014
+#      by: PyQt4 UI code generator 4.9.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,16 +12,7 @@ from PyQt4 import QtCore, QtGui
 try:
     _fromUtf8 = QtCore.QString.fromUtf8
 except AttributeError:
-    def _fromUtf8(s):
-        return s
-
-try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
+    _fromUtf8 = lambda s: s
 
 class Ui_settingsDialog(object):
     def setupUi(self, settingsDialog):
@@ -72,6 +63,9 @@ class Ui_settingsDialog(object):
         self.checkBoxUseIdenticons = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxUseIdenticons.setObjectName(_fromUtf8("checkBoxUseIdenticons"))
         self.formLayout.setWidget(7, QtGui.QFormLayout.LabelRole, self.checkBoxUseIdenticons)
+        self.checkBoxReplyBelow = QtGui.QCheckBox(self.tabUserInterface)
+        self.checkBoxReplyBelow.setObjectName(_fromUtf8("checkBoxReplyBelow"))
+        self.formLayout.setWidget(8, QtGui.QFormLayout.LabelRole, self.checkBoxReplyBelow)
         self.groupBox = QtGui.QGroupBox(self.tabUserInterface)
         self.groupBox.setObjectName(_fromUtf8("groupBox"))
         self.formLayout_2 = QtGui.QFormLayout(self.groupBox)
@@ -92,7 +86,7 @@ class Ui_settingsDialog(object):
         self.languageComboBox.addItem(_fromUtf8(""))
         self.languageComboBox.addItem(_fromUtf8(""))
         self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.languageComboBox)
-        self.formLayout.setWidget(8, QtGui.QFormLayout.FieldRole, self.groupBox)
+        self.formLayout.setWidget(9, QtGui.QFormLayout.FieldRole, self.groupBox)
         self.tabWidgetSettings.addTab(self.tabUserInterface, _fromUtf8(""))
         self.tabNetworkSettings = QtGui.QWidget()
         self.tabNetworkSettings.setObjectName(_fromUtf8("tabNetworkSettings"))
@@ -383,68 +377,69 @@ class Ui_settingsDialog(object):
         settingsDialog.setTabOrder(self.checkBoxSocksListen, self.buttonBox)
 
     def retranslateUi(self, settingsDialog):
-        settingsDialog.setWindowTitle(_translate("settingsDialog", "Settings", None))
-        self.checkBoxStartOnLogon.setText(_translate("settingsDialog", "Start Bitmessage on user login", None))
-        self.checkBoxStartInTray.setText(_translate("settingsDialog", "Start Bitmessage in the tray (don\'t show main window)", None))
-        self.checkBoxMinimizeToTray.setText(_translate("settingsDialog", "Minimize to tray", None))
-        self.checkBoxShowTrayNotifications.setText(_translate("settingsDialog", "Show notification when message received", None))
-        self.checkBoxPortableMode.setText(_translate("settingsDialog", "Run in Portable Mode", 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.checkBoxUseIdenticons.setText(_translate("settingsDialog", "Use Identicons", 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ñl", "es"))
-        self.languageComboBox.setItemText(6, _translate("settingsDialog", "русский язык", "ru"))
-        self.languageComboBox.setItemText(7, _translate("settingsDialog", "Norsk", "no"))
-        self.languageComboBox.setItemText(8, _translate("settingsDialog", "العربية", "ar"))
-        self.languageComboBox.setItemText(9, _translate("settingsDialog", "简体中文", "zh_cn"))
-        self.languageComboBox.setItemText(10, _translate("settingsDialog", "Pirate English", "en_pirate"))
-        self.languageComboBox.setItemText(11, _translate("settingsDialog", "Other (set in keys.dat)", "other"))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabUserInterface), _translate("settingsDialog", "User Interface", 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))
-        self.label_3.setText(_translate("settingsDialog", "Server hostname:", None))
-        self.label_4.setText(_translate("settingsDialog", "Port:", None))
-        self.checkBoxAuthentication.setText(_translate("settingsDialog", "Authentication", None))
-        self.label_5.setText(_translate("settingsDialog", "Username:", None))
-        self.label_6.setText(_translate("settingsDialog", "Pass:", None))
-        self.checkBoxSocksListen.setText(_translate("settingsDialog", "Listen for incoming connections when using proxy", None))
-        self.comboBoxProxyType.setItemText(0, _translate("settingsDialog", "none", None))
-        self.comboBoxProxyType.setItemText(1, _translate("settingsDialog", "SOCKS4a", None))
-        self.comboBoxProxyType.setItemText(2, _translate("settingsDialog", "SOCKS5", None))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabNetworkSettings), _translate("settingsDialog", "Network Settings", None))
-        self.label_9.setText(_translate("settingsDialog", "Total difficulty:", None))
-        self.label_10.setText(_translate("settingsDialog", "The \'Total difficulty\' affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work.", None))
-        self.label_11.setText(_translate("settingsDialog", "Small message difficulty:", None))
-        self.label_8.setText(_translate("settingsDialog", "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. ", None))
-        self.label_12.setText(_translate("settingsDialog", "The \'Small message difficulty\' 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\'t really affect large messages.", None))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabDemandedDifficulty), _translate("settingsDialog", "Demanded difficulty", None))
-        self.label_15.setText(_translate("settingsDialog", "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.", None))
-        self.label_13.setText(_translate("settingsDialog", "Maximum acceptable total difficulty:", None))
-        self.label_14.setText(_translate("settingsDialog", "Maximum acceptable small message difficulty:", None))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabMaxAcceptableDifficulty), _translate("settingsDialog", "Max acceptable difficulty", None))
-        self.label_16.setText(_translate("settingsDialog", "<html><head/><body><p>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 <span style=\" font-style:italic;\">test. </span></p><p>(Getting your own Bitmessage address into Namecoin is still rather difficult).</p><p>Bitmessage can use either namecoind directly or a running nmcontrol instance.</p></body></html>", None))
-        self.label_17.setText(_translate("settingsDialog", "Host:", None))
-        self.label_18.setText(_translate("settingsDialog", "Port:", None))
-        self.labelNamecoinUser.setText(_translate("settingsDialog", "Username:", None))
-        self.labelNamecoinPassword.setText(_translate("settingsDialog", "Password:", None))
-        self.pushButtonNamecoinTest.setText(_translate("settingsDialog", "Test", None))
-        self.label_21.setText(_translate("settingsDialog", "Connect to:", None))
-        self.radioButtonNamecoinNamecoind.setText(_translate("settingsDialog", "Namecoind", None))
-        self.radioButtonNamecoinNmcontrol.setText(_translate("settingsDialog", "NMControl", None))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabNamecoin), _translate("settingsDialog", "Namecoin integration", None))
-        self.label_7.setText(_translate("settingsDialog", "<html><head/><body><p>By default, if you send a message to someone and he is offline for more than two days, Bitmessage will send the message again after an additional two days. This will be continued with exponential backoff forever; messages will be resent after 5, 10, 20 days ect. until the receiver acknowledges them. Here you may change that behavior by having Bitmessage give up after a certain number of days or months.</p><p>Leave these input fields blank for the default behavior. </p></body></html>", None))
-        self.label_19.setText(_translate("settingsDialog", "Give up after", None))
-        self.label_20.setText(_translate("settingsDialog", "and", None))
-        self.label_22.setText(_translate("settingsDialog", "days", None))
-        self.label_23.setText(_translate("settingsDialog", "months.", None))
-        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabResendsExpire), _translate("settingsDialog", "Resends Expire", None))
+        settingsDialog.setWindowTitle(QtGui.QApplication.translate("settingsDialog", "Settings", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxStartOnLogon.setText(QtGui.QApplication.translate("settingsDialog", "Start Bitmessage on user login", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxStartInTray.setText(QtGui.QApplication.translate("settingsDialog", "Start Bitmessage in the tray (don\'t show main window)", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxMinimizeToTray.setText(QtGui.QApplication.translate("settingsDialog", "Minimize to tray", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxShowTrayNotifications.setText(QtGui.QApplication.translate("settingsDialog", "Show notification when message received", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxPortableMode.setText(QtGui.QApplication.translate("settingsDialog", "Run in Portable Mode", None, QtGui.QApplication.UnicodeUTF8))
+        self.PortableModeDescription.setText(QtGui.QApplication.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, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxWillinglySendToMobile.setText(QtGui.QApplication.translate("settingsDialog", "Willingly include unencrypted destination address when sending to a mobile device", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxUseIdenticons.setText(QtGui.QApplication.translate("settingsDialog", "Use Identicons", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxReplyBelow.setText(QtGui.QApplication.translate("settingsDialog", "Reply below Quote", None, QtGui.QApplication.UnicodeUTF8))
+        self.groupBox.setTitle(QtGui.QApplication.translate("settingsDialog", "Interface Language", None, QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(0, QtGui.QApplication.translate("settingsDialog", "System Settings", "system", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(1, QtGui.QApplication.translate("settingsDialog", "English", "en", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(2, QtGui.QApplication.translate("settingsDialog", "Esperanto", "eo", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(3, QtGui.QApplication.translate("settingsDialog", "Français", "fr", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(4, QtGui.QApplication.translate("settingsDialog", "Deutsch", "de", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(5, QtGui.QApplication.translate("settingsDialog", "Españl", "es", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(6, QtGui.QApplication.translate("settingsDialog", "русский язык", "ru", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(7, QtGui.QApplication.translate("settingsDialog", "Norsk", "no", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(8, QtGui.QApplication.translate("settingsDialog", "العربية", "ar", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(9, QtGui.QApplication.translate("settingsDialog", "简体中文", "zh_cn", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(10, QtGui.QApplication.translate("settingsDialog", "Pirate English", "en_pirate", QtGui.QApplication.UnicodeUTF8))
+        self.languageComboBox.setItemText(11, QtGui.QApplication.translate("settingsDialog", "Other (set in keys.dat)", "other", QtGui.QApplication.UnicodeUTF8))
+        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabUserInterface), QtGui.QApplication.translate("settingsDialog", "User Interface", None, QtGui.QApplication.UnicodeUTF8))
+        self.groupBox1.setTitle(QtGui.QApplication.translate("settingsDialog", "Listening port", None, QtGui.QApplication.UnicodeUTF8))
+        self.label.setText(QtGui.QApplication.translate("settingsDialog", "Listen for connections on port:", None, QtGui.QApplication.UnicodeUTF8))
+        self.groupBox_2.setTitle(QtGui.QApplication.translate("settingsDialog", "Proxy server / Tor", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_2.setText(QtGui.QApplication.translate("settingsDialog", "Type:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_3.setText(QtGui.QApplication.translate("settingsDialog", "Server hostname:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_4.setText(QtGui.QApplication.translate("settingsDialog", "Port:", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxAuthentication.setText(QtGui.QApplication.translate("settingsDialog", "Authentication", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_5.setText(QtGui.QApplication.translate("settingsDialog", "Username:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_6.setText(QtGui.QApplication.translate("settingsDialog", "Pass:", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxSocksListen.setText(QtGui.QApplication.translate("settingsDialog", "Listen for incoming connections when using proxy", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboBoxProxyType.setItemText(0, QtGui.QApplication.translate("settingsDialog", "none", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboBoxProxyType.setItemText(1, QtGui.QApplication.translate("settingsDialog", "SOCKS4a", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboBoxProxyType.setItemText(2, QtGui.QApplication.translate("settingsDialog", "SOCKS5", None, QtGui.QApplication.UnicodeUTF8))
+        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabNetworkSettings), QtGui.QApplication.translate("settingsDialog", "Network Settings", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_9.setText(QtGui.QApplication.translate("settingsDialog", "Total difficulty:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_10.setText(QtGui.QApplication.translate("settingsDialog", "The \'Total difficulty\' affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work.", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_11.setText(QtGui.QApplication.translate("settingsDialog", "Small message difficulty:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_8.setText(QtGui.QApplication.translate("settingsDialog", "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. ", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_12.setText(QtGui.QApplication.translate("settingsDialog", "The \'Small message difficulty\' 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\'t really affect large messages.", None, QtGui.QApplication.UnicodeUTF8))
+        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabDemandedDifficulty), QtGui.QApplication.translate("settingsDialog", "Demanded difficulty", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_15.setText(QtGui.QApplication.translate("settingsDialog", "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.", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_13.setText(QtGui.QApplication.translate("settingsDialog", "Maximum acceptable total difficulty:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_14.setText(QtGui.QApplication.translate("settingsDialog", "Maximum acceptable small message difficulty:", None, QtGui.QApplication.UnicodeUTF8))
+        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabMaxAcceptableDifficulty), QtGui.QApplication.translate("settingsDialog", "Max acceptable difficulty", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_16.setText(QtGui.QApplication.translate("settingsDialog", "<html><head/><body><p>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 <span style=\" font-style:italic;\">test. </span></p><p>(Getting your own Bitmessage address into Namecoin is still rather difficult).</p><p>Bitmessage can use either namecoind directly or a running nmcontrol instance.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_17.setText(QtGui.QApplication.translate("settingsDialog", "Host:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_18.setText(QtGui.QApplication.translate("settingsDialog", "Port:", None, QtGui.QApplication.UnicodeUTF8))
+        self.labelNamecoinUser.setText(QtGui.QApplication.translate("settingsDialog", "Username:", None, QtGui.QApplication.UnicodeUTF8))
+        self.labelNamecoinPassword.setText(QtGui.QApplication.translate("settingsDialog", "Password:", None, QtGui.QApplication.UnicodeUTF8))
+        self.pushButtonNamecoinTest.setText(QtGui.QApplication.translate("settingsDialog", "Test", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_21.setText(QtGui.QApplication.translate("settingsDialog", "Connect to:", None, QtGui.QApplication.UnicodeUTF8))
+        self.radioButtonNamecoinNamecoind.setText(QtGui.QApplication.translate("settingsDialog", "Namecoind", None, QtGui.QApplication.UnicodeUTF8))
+        self.radioButtonNamecoinNmcontrol.setText(QtGui.QApplication.translate("settingsDialog", "NMControl", None, QtGui.QApplication.UnicodeUTF8))
+        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabNamecoin), QtGui.QApplication.translate("settingsDialog", "Namecoin integration", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_7.setText(QtGui.QApplication.translate("settingsDialog", "<html><head/><body><p>By default, if you send a message to someone and he is offline for more than two days, Bitmessage will send the message again after an additional two days. This will be continued with exponential backoff forever; messages will be resent after 5, 10, 20 days ect. until the receiver acknowledges them. Here you may change that behavior by having Bitmessage give up after a certain number of days or months.</p><p>Leave these input fields blank for the default behavior. </p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_19.setText(QtGui.QApplication.translate("settingsDialog", "Give up after", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_20.setText(QtGui.QApplication.translate("settingsDialog", "and", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_22.setText(QtGui.QApplication.translate("settingsDialog", "days", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_23.setText(QtGui.QApplication.translate("settingsDialog", "months.", None, QtGui.QApplication.UnicodeUTF8))
+        self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabResendsExpire), QtGui.QApplication.translate("settingsDialog", "Resends Expire", None, QtGui.QApplication.UnicodeUTF8))
 
 import bitmessage_icons_rc
diff --git a/src/bitmessageqt/settings.ui b/src/bitmessageqt/settings.ui
index 2af19613..4cb8fb4e 100644
--- a/src/bitmessageqt/settings.ui
+++ b/src/bitmessageqt/settings.ui
@@ -105,7 +105,14 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="1">
+       <item row="8" column="0">
+        <widget class="QCheckBox" name="checkBoxReplyBelow">
+         <property name="text">
+          <string>Reply below Quote</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Interface Language</string>
diff --git a/src/helper_startup.py b/src/helper_startup.py
index abc4958f..4d7ffbfc 100644
--- a/src/helper_startup.py
+++ b/src/helper_startup.py
@@ -90,6 +90,7 @@ def loadConfig():
         shared.config.set('bitmessagesettings', 'userlocale', 'system')
         shared.config.set('bitmessagesettings', 'useidenticons', 'True')
         shared.config.set('bitmessagesettings', 'identiconsuffix', ''.join(random.choice("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz") for x in range(12))) # a twelve character pseudo-password to salt the identicons
+        shared.config.set('bitmessagesettings', 'replybelow', 'False')
         
          #start:UI setting to stop trying to send messages after X days/months
         shared.config.set(
@@ -130,4 +131,4 @@ def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
         return False
     except Exception as err:
         print 'An Exception occurred within isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections:', err
-        return False
\ No newline at end of file
+        return False

From e63276c24074fb084aa7258126a9186121ba1ffa Mon Sep 17 00:00:00 2001
From: goldbook <goldbook@users.noreply.github.com>
Date: Sat, 1 Feb 2014 17:15:50 +0900
Subject: [PATCH 09/20] add japanese transration.

---
 src/bitmessageqt/__init__.py       |    2 +-
 src/bitmessageqt/settings.py       |    6 +-
 src/translations/bitmessage_ja.pro |   33 +
 src/translations/bitmessage_ja.qm  |  Bin 0 -> 18960 bytes
 src/translations/bitmessage_ja.ts  | 1462 ++++++++++++++++++++++++++++
 5 files changed, 1500 insertions(+), 3 deletions(-)
 create mode 100644 src/translations/bitmessage_ja.pro
 create mode 100644 src/translations/bitmessage_ja.qm
 create mode 100644 src/translations/bitmessage_ja.ts

diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 7125cb60..888376fa 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -3320,7 +3320,7 @@ class settingsDialog(QtGui.QDialog):
             shared.safeConfigGetBoolean('bitmessagesettings', 'useidenticons'))
         
         global languages 
-        languages = ['system','en','eo','fr','de','es','ru','no','ar','zh_cn','en_pirate','other']
+        languages = ['system','en','eo','fr','de','es','ru','no','ar','zh_cn','ja','en_pirate','other']
         user_countrycode = str(shared.config.get('bitmessagesettings', 'userlocale'))
         if user_countrycode in languages:
             curr_index = languages.index(user_countrycode)
diff --git a/src/bitmessageqt/settings.py b/src/bitmessageqt/settings.py
index 293c133b..6f568a93 100644
--- a/src/bitmessageqt/settings.py
+++ b/src/bitmessageqt/settings.py
@@ -91,6 +91,7 @@ class Ui_settingsDialog(object):
         self.languageComboBox.addItem(_fromUtf8(""))
         self.languageComboBox.addItem(_fromUtf8(""))
         self.languageComboBox.addItem(_fromUtf8(""))
+        self.languageComboBox.addItem(_fromUtf8(""))
         self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.languageComboBox)
         self.formLayout.setWidget(8, QtGui.QFormLayout.FieldRole, self.groupBox)
         self.tabWidgetSettings.addTab(self.tabUserInterface, _fromUtf8(""))
@@ -403,8 +404,9 @@ class Ui_settingsDialog(object):
         self.languageComboBox.setItemText(7, _translate("settingsDialog", "Norsk", "no"))
         self.languageComboBox.setItemText(8, _translate("settingsDialog", "العربية", "ar"))
         self.languageComboBox.setItemText(9, _translate("settingsDialog", "简体中文", "zh_cn"))
-        self.languageComboBox.setItemText(10, _translate("settingsDialog", "Pirate English", "en_pirate"))
-        self.languageComboBox.setItemText(11, _translate("settingsDialog", "Other (set in keys.dat)", "other"))
+        self.languageComboBox.setItemText(10, _translate("settingsDialog", "日本語", "ja"))
+        self.languageComboBox.setItemText(11, _translate("settingsDialog", "Pirate English", "en_pirate"))
+        self.languageComboBox.setItemText(12, _translate("settingsDialog", "Other (set in keys.dat)", "other"))
         self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabUserInterface), _translate("settingsDialog", "User Interface", None))
         self.groupBox1.setTitle(_translate("settingsDialog", "Listening port", None))
         self.label.setText(_translate("settingsDialog", "Listen for connections on port:", None))
diff --git a/src/translations/bitmessage_ja.pro b/src/translations/bitmessage_ja.pro
new file mode 100644
index 00000000..f6e5ad63
--- /dev/null
+++ b/src/translations/bitmessage_ja.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_ja.ts
+CODECFORTR		= UTF-8
diff --git a/src/translations/bitmessage_ja.qm b/src/translations/bitmessage_ja.qm
new file mode 100644
index 0000000000000000000000000000000000000000..cd9798af939f1817018520f5e78721a2e722123e
GIT binary patch
literal 18960
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%0Dlhf!~8Kk5Atu~Z(NtF
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
A4FCWD

literal 0
HcmV?d00001

diff --git a/src/translations/bitmessage_ja.ts b/src/translations/bitmessage_ja.ts
new file mode 100644
index 00000000..b385e57d
--- /dev/null
+++ b/src/translations/bitmessage_ja.ts
@@ -0,0 +1,1462 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ja_JP" 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>%1は古いバージョン1のアドレスです。バージョン1のアドレスはサポートが終了しています。すぐに削除しますか？</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="163"/>
+        <source>Reply</source>
+        <translatorcomment>.</translatorcomment>
+        <translation>返信</translation>
+    </message>
+    <message>
+        <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="269"/>
+        <source>Move to Trash</source>
+        <translation>ゴミ箱へ移動</translation>
+    </message>
+    <message>
+        <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="171"/>
+        <source>Save message as...</source>
+        <translation>形式を選択してメッセージを保存</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="173"/>
+        <source>Mark Unread</source>
+        <translation>未読にする</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="573"/>
+        <source>New</source>
+        <translation>新規</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="292"/>
+        <source>Enable</source>
+        <translation>有効</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="294"/>
+        <source>Disable</source>
+        <translation>無効</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="290"/>
+        <source>Copy address to clipboard</source>
+        <translation>アドレスをコピー</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="200"/>
+        <source>Special address behavior...</source>
+        <translation>アドレスの特別な動作</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="218"/>
+        <source>Send message to this address</source>
+        <translation>このアドレスへ送信</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="222"/>
+        <source>Subscribe to this address</source>
+        <translation>このアドレスを購読</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="224"/>
+        <source>Add New Address</source>
+        <translation>アドレスを追加</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="288"/>
+        <source>Delete</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="271"/>
+        <source>Copy destination address to clipboard</source>
+        <translation>宛先アドレスをコピー</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="273"/>
+        <source>Force send</source>
+        <translation>強制的に送信</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="600"/>
+        <source>Add new entry</source>
+        <translation>新しい項目を追加</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>未接続</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>購読</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="597"/>
+        <source>Address Book</source>
+        <translation>アドレス帳</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="622"/>
+        <source>Quit</source>
+        <translation>終了</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>プログラムを同じディレクトリに保存されているkeys.datファイルを編集することで鍵を管理できます。ファイルをバックアップしておくことも重要です。</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>%1に保存されているkeys.datファイルを編集することで鍵を管理できます。ファイルをバックアップしておくことも重要です。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1141"/>
+        <source>Open keys.dat?</source>
+        <translation>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>プログラムを同じディレクトリに保存されているkeys.datファイルを編集することで鍵を管理できます。ファイルをバックアップしておくことも重要です。すぐにファイルを開きますか？（必ず編集する前にBitmessageを終了してください）</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>%1に保存されているkeys.datファイルを編集することで鍵を管理できます。ファイルをバックアップしておくことも重要です。すぐにファイルを開きますか？（必ず編集する前にBitmessageを終了してください）</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1147"/>
+        <source>Delete trash?</source>
+        <translation>ゴミ箱を空にしますか？</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1147"/>
+        <source>Are you sure you want to delete all trashed messages?</source>
+        <translation>ゴミ箱内のメッセージを全て削除してもよろしいですか？</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1158"/>
+        <source>bad passphrase</source>
+        <translation>不正なパスフレーズ</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>パスフレーズを入力してください。パスフレーズがない場合は入力する必要はありません。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1197"/>
+        <source>Chan name needed</source>
+        <translation>Chan名が必要です</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1197"/>
+        <source>You didn&apos;t enter a chan name.</source>
+        <translation>chan名が入力されていません。</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>成功</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>アドレスが不正です</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1205"/>
+        <source>That Bitmessage address is not valid.</source>
+        <translation>このBitmessageアドレスは不正です。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1213"/>
+        <source>Address does not match chan name</source>
+        <translation>アドレスがchan名と一致しません</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>chanに参加しました。</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>接続数: %1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1338"/>
+        <source>Connection lost</source>
+        <translation>接続が切断されました</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1379"/>
+        <source>Connected</source>
+        <translation>接続済み</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1425"/>
+        <source>Message trashed</source>
+        <translation>メッセージが削除されました</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>アドレスへ送信中</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>アドレスのバージョン番号</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>ストリーム番号</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>宛先が指定されていません。</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>新規メッセージ</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="1874"/>
+        <source>From </source>
+        <translation>送信元</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3282"/>
+        <source>Address is valid.</source>
+        <translation>アドレスが不正です。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2230"/>
+        <source>The address you entered was invalid. Ignoring it.</source>
+        <translation>入力されたアドレスは不正です。無視されました。</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>再開</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>ポート番号の変更を有効にするにはBitmessageを再起動してください。</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>パスフレーズが一致しません</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2280"/>
+        <source>The passphrase you entered twice doesn&apos;t match. Try again.</source>
+        <translation>再度入力されたパスフレーズが一致しません。再入力してください。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2283"/>
+        <source>Choose a passphrase</source>
+        <translation>パスフレーズを選択してください</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>完了しました。ユーザーインターフェースを閉じています。</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>アドレス%1が見つかりません。既に削除されている可能性があります。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2384"/>
+        <source>Address disabled</source>
+        <translation>アドレスが無効になりました</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>アイテムをゴミ箱へ移動。ゴミ箱の内容を表示する画面はありませんが、もし元に戻したくなった場合に備えてディスク上に残されます。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2476"/>
+        <source>Save As...</source>
+        <translation>形式を選択して保存</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2485"/>
+        <source>Write error.</source>
+        <translation>書き込みエラー。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="2596"/>
+        <source>No addresses selected.</source>
+        <translation>アドレスが未選択です。</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>テスト中</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>アドレスは「BM-」から始まります</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3267"/>
+        <source>The address is not typed or copied correctly (the checksum failed).</source>
+        <translation>このアドレスは正しく入力、またはコピーされていません。（チェックサムが一致しません）。</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>このアドレスのバージョン番号はこのプログラムのサポート範囲外です。Bitmessageをアップデートしてください。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/__init__.py" line="3273"/>
+        <source>The address contains invalid characters.</source>
+        <translation>入力されたアドレスは不正な文字を含んでいます。</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>使用中のポート %1 （設定で変更できます）</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="524"/>
+        <source>Bitmessage</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="557"/>
+        <source>Search</source>
+        <translation>検索</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="558"/>
+        <source>All</source>
+        <translation>全て</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="565"/>
+        <source>To</source>
+        <translation>宛先</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="567"/>
+        <source>From</source>
+        <translation>送信元</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="569"/>
+        <source>Subject</source>
+        <translation>題名</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="562"/>
+        <source>Message</source>
+        <translation>メッセージ</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="539"/>
+        <source>Received</source>
+        <translation>受信日時</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="540"/>
+        <source>Inbox</source>
+        <translation>受信箱</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="541"/>
+        <source>Load from Address book</source>
+        <translation>アドレス帳から読み込み</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>メッセージ:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="544"/>
+        <source>Subject:</source>
+        <translation>題名:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="545"/>
+        <source>Send to one or more specific people</source>
+        <translation>一人、または複数のユーザーへ送信</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>宛先:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="552"/>
+        <source>From:</source>
+        <translation>送信元:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="553"/>
+        <source>Broadcast to everyone who is subscribed to your address</source>
+        <translation>自分のアドレスを購読しているユーザー全員へ配信する</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>状態</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>ラベル（他の人からは見えません）</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="605"/>
+        <source>Address</source>
+        <translation>アドレス</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="580"/>
+        <source>Stream</source>
+        <translation>ストリーム</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="581"/>
+        <source>Your Identities</source>
+        <translation>アドレス一覧</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>購読先を追加</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="586"/>
+        <source>Label</source>
+        <translation>ラベル</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="589"/>
+        <source>Subscriptions</source>
+        <translation>購読リスト</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>名前、ラベル</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>ブラックリストを使用（全てのメッセージを受信してブラックリストと一致する物だけ除外）</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>ホワイトリストを使用（全てのメッセージを受信拒否してホワイトリストと一致する物だけ許可）</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="606"/>
+        <source>Blacklist</source>
+        <translation>ブラックリスト</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="608"/>
+        <source>Stream #</source>
+        <translation>ストリーム #</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="610"/>
+        <source>Connections</source>
+        <translation>接続</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="611"/>
+        <source>Total connections: 0</source>
+        <translation>接続数: 0</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>ネットワークの状態</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="617"/>
+        <source>File</source>
+        <translation>ファイル</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="627"/>
+        <source>Settings</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="624"/>
+        <source>Help</source>
+        <translation>ヘルプ</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="620"/>
+        <source>Import keys</source>
+        <translation>鍵をインポート</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="621"/>
+        <source>Manage keys</source>
+        <translation>鍵を管理</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="623"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="625"/>
+        <source>F1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="626"/>
+        <source>About</source>
+        <translation>概要</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>ゴミ箱のメッセージを全て削除する</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/bitmessageui.py" line="630"/>
+        <source>Join / Create chan</source>
+        <translation>chanに参加 / 作成</translation>
+    </message>
+</context>
+<context>
+    <name>NewAddressDialog</name>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="173"/>
+        <source>Create new Address</source>
+        <translation>新しいアドレスを作成</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>アドレスの生成に乱数ジェネレーターを使う</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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="180"/>
+        <source>Make deterministic addresses</source>
+        <translation type="unfinished">Make deterministic arrddresses</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="181"/>
+        <source>Address version number: 3</source>
+        <translation>アドレスのバージョン番号: 3</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>パスフレーズ</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="184"/>
+        <source>Number of addresses to make based on your passphrase:</source>
+        <translation>パスフレーズから生成されたアドレスの数</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="185"/>
+        <source>Stream number: 1</source>
+        <translation>ストリーム数: 1</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="186"/>
+        <source>Retype passphrase</source>
+        <translation>パスフレーズを再入力</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="187"/>
+        <source>Randomly generate address</source>
+        <translation>ランダムなアドレスを生成する</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="188"/>
+        <source>Label (not shown to anyone except you)</source>
+        <translation>ラベル（他の人からは見えません）</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>既存のアドレスと同じストリームを利用する</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="192"/>
+        <source>(saves you some bandwidth and processing power)</source>
+        <translation>（帯域と処理能力を節約する）</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newaddressdialog.py" line="178"/>
+        <source>Use a passphrase to make addresses</source>
+        <translation>アドレスの作成にパスフレーズを使う</translation>
+    </message>
+</context>
+<context>
+    <name>NewSubscriptionDialog</name>
+    <message>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="57"/>
+        <source>Add new entry</source>
+        <translation>新しい項目を追加</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="58"/>
+        <source>Label</source>
+        <translation>ラベル</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newsubscriptiondialog.py" line="59"/>
+        <source>Address</source>
+        <translation>アドレス</translation>
+    </message>
+</context>
+<context>
+    <name>SpecialAddressBehaviorDialog</name>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="59"/>
+        <source>Special Address Behavior</source>
+        <translation>アドレスの特別な動作</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="60"/>
+        <source>Behave as a normal address</source>
+        <translation>通常のアドレスにする</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="61"/>
+        <source>Behave as a pseudo-mailing-list address</source>
+        <translation>仮想メーリングリストとして使用する</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>仮想メーリングリストのアドレスが受信したアドレスは自動的に購読するユーザーに配信（公開）されます。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/specialaddressbehavior.py" line="63"/>
+        <source>Name of the pseudo-mailing-list:</source>
+        <translation>仮想メーリングリストの名前:</translation>
+    </message>
+</context>
+<context>
+    <name>aboutDialog</name>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="58"/>
+        <source>PyBitmessage</source>
+        <translation></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>概要</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/about.py" line="60"/>
+        <source>Copyright © 2013 Jonathan Warren</source>
+        <translation></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>このソフトウェアはベータ版です。</translation>
+    </message>
+</context>
+<context>
+    <name>connectDialog</name>
+    <message>
+        <location filename="../bitmessageqt/connect.py" line="56"/>
+        <source>Bitmessage</source>
+        <translation></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>
+        <location filename="../bitmessageqt/help.py" line="45"/>
+        <source>Help</source>
+        <translation>ヘルプ</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は協働プロジェクトです。ヘルプはBitmessage Wikiを参照してください:</translation>
+    </message>
+</context>
+<context>
+    <name>iconGlossaryDialog</name>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="82"/>
+        <source>Icon Glossary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/iconglossary.py" line="83"/>
+        <source>You have no connections with other peers. </source>
+        <translation>他のpeerへ接続されていません。</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>使用中のポート ? （設定で変更できます）</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>ファイアーウォールを適切に設定し、他のpeerへ接続してください。</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>ダイアログ</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="98"/>
+        <source>Create a new chan</source>
+        <translation>新しいchanを作成</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="103"/>
+        <source>Join a chan</source>
+        <translation>chanに参加</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="100"/>
+        <source>Create a chan</source>
+        <translation>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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/newchandialog.py" line="105"/>
+        <source>Chan name:</source>
+        <translation>Chan名:</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>既存のアドレスを再生成する</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="105"/>
+        <source>Regenerate existing addresses</source>
+        <translation>既存のアドレスを再生成する</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="106"/>
+        <source>Passphrase</source>
+        <translation>パスフレーズ</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="107"/>
+        <source>Number of addresses to make based on your passphrase:</source>
+        <translation>パスフレーズから生成されたアドレスの数:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="108"/>
+        <source>Address version Number:</source>
+        <translation>アドレスのバージョン番号:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="109"/>
+        <source>3</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="110"/>
+        <source>Stream number:</source>
+        <translation>ストリーム数:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/regenerateaddresses.py" line="111"/>
+        <source>1</source>
+        <translation></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"></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"></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"></translation>
+    </message>
+</context>
+<context>
+    <name>settingsDialog</name>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="335"/>
+        <source>Settings</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="340"/>
+        <source>Start Bitmessage on user login</source>
+        <translation>ユーザのログイン時にBitmessageを起動</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="336"/>
+        <source>Start Bitmessage in the tray (don&apos;t show main window)</source>
+        <translation>Bitmessageをトレイ内で起動する（メインウィンドウを表示しない）</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="338"/>
+        <source>Minimize to tray</source>
+        <translation>タスクトレイへ最小化</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="337"/>
+        <source>Show notification when message received</source>
+        <translation>メッセージの受信時に通知する</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="341"/>
+        <source>Run in Portable Mode</source>
+        <translation>ポータブルモードで実行</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>ポータブルモード時、メッセージと設定ファイルは通常のアプリケーションデータのフォルダではなく同じディレクトリに保存されます。これによりBitmessageをUSBドライブから実行できます。</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="344"/>
+        <source>User Interface</source>
+        <translation>ユーザインターフェース</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="345"/>
+        <source>Listening port</source>
+        <translation>リスニングポート</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="346"/>
+        <source>Listen for connections on port:</source>
+        <translation>接続を待つポート:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="347"/>
+        <source>Proxy server / Tor</source>
+        <translation>プロキシサーバー/Tor</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="348"/>
+        <source>Type:</source>
+        <translation>タイプ:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="349"/>
+        <source>none</source>
+        <translation>無し</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>サーバーホスト名:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="371"/>
+        <source>Port:</source>
+        <translation>ポート:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="354"/>
+        <source>Authentication</source>
+        <translation>認証</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="372"/>
+        <source>Username:</source>
+        <translation>ユーザー名:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="356"/>
+        <source>Pass:</source>
+        <translation>パス:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="358"/>
+        <source>Network Settings</source>
+        <translation>ネットワーク設定</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">Total difficulty:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="361"/>
+        <source>Small message difficulty:</source>
+        <translation type="unfinished">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 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">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>自動的に設定された言語・地域を上書きする（国コード、または言語コードを入力。例:「en_US」または「en」）</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="357"/>
+        <source>Listen for incoming connections when using proxy</source>
+        <translation>プロキシ使用時に外部からの接続を待機する</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>ホスト:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="373"/>
+        <source>Password:</source>
+        <translation>パスワード:</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="374"/>
+        <source>Test</source>
+        <translation>テスト</translation>
+    </message>
+    <message>
+        <location filename="../bitmessageqt/settings.py" line="375"/>
+        <source>Connect to:</source>
+        <translation>接続先:</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>

From 1204442fcd255394961b1c202cac0fd7a557a200 Mon Sep 17 00:00:00 2001
From: IZARTeam <izar.magic@gmail.com>
Date: Thu, 6 Feb 2014 03:31:51 +0800
Subject: [PATCH 10/20] Add zh_cn translations in class_singleWorker.py

And fix some mistakes in Chinese translation
---
 src/translations/bitmessage_zh_cn.qm | Bin 39733 -> 42405 bytes
 src/translations/bitmessage_zh_cn.ts |  93 ++++++++++++++++++++++++++-
 2 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/src/translations/bitmessage_zh_cn.qm b/src/translations/bitmessage_zh_cn.qm
index dce6934795e909e521b6c72629bbcbaa515432aa..3f894afd7087d156a33a57fbe1448e33852bd982 100644
GIT binary patch
delta 4535
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
TFQFm(c!yc$D{T%7eVp+x31M#l

delta 2567
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
WKd8ddHN>TSWpId8erVkDIsXU8CDvyE

diff --git a/src/translations/bitmessage_zh_cn.ts b/src/translations/bitmessage_zh_cn.ts
index 1812e4bf..adc055e5 100644
--- a/src/translations/bitmessage_zh_cn.ts
+++ b/src/translations/bitmessage_zh_cn.ts
@@ -862,7 +862,7 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2750"/>
         <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>
+        <translation>已经移动项目到回收站。没有图形化的界面可以查看您的回收站，不过如果您还想找回的话它还在您的硬盘上。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2730"/>
@@ -882,7 +882,7 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3063"/>
         <source>Do you really want to remove this avatar?</source>
-        <translation>您真的想一处这个头像么？</translation>
+        <translation>您真的想移除这个头像么？</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3071"/>
@@ -984,6 +984,95 @@ It is important that you back up this file. Would you like to open the file now?
         <source>Message sent. Waiting for acknowledgement. Sent at %1</source>
         <translation>消息已经发送. 正在等待回执. 发送于 %1</translation>
     </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="361"/>
+        <source>Error! Could not find sender address (your address) in the keys.dat file.</source>
+        <translation>错误! 无法在文件 keys.dat 中找到发送者地址(你的地址)</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="426"/>
+        <source>Doing work necessary to send broadcast...</source>
+        <translation>正在做一些必须的工作来发送广播.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="443"/>
+        <source>Broadcast sent on %1</source>
+        <translation>广播发送于 %1</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="485"/>
+        <source>Encryption key was requested earlier.</source>
+        <translation>已在更早的时候得到加密密钥.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="523"/>
+        <source>Sending a request for the recipient&apos;s encryption key.</source>
+        <translation>正在请求收件人的加密密钥.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="564"/>
+        <source>Looking up the receiver&apos;s public key</source>
+        <translation>正在查找收件人的公钥.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="619"/>
+        <source>Problem: Destination is a mobile device who requests that the destination be included in the message but this is disallowed in your settings.  %1</source>
+        <translation>错误: 目标是一个移动设备, 要求不加密目标地址, 但是你的设置中不允许这么做. %1</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="636"/>
+        <source>Doing work necessary to send message.
+There is no required difficulty for version 2 addresses like this.</source>
+        <translation>正在做一些必要的工作来发送消息.
+这里要求的难度不像第2版的地址那样.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="648"/>
+        <source>Doing work necessary to send message.
+Receiver&apos;s required difficulty: %1 and %2</source>
+        <translation>正在做一些必要的工作来发送消息.
+接收者要求的难度为: %1 和 %2</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="657"/>
+        <source>Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do.</source>
+        <translation>错误: 收件人要求的做工量(%1 和 %2)大于我们的最大接受做工量. </translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="669"/>
+        <source>Problem: You are trying to send a message to yourself or a chan but your encryption key could not be found in the keys.dat file. Could not encrypt message. %1</source>
+        <translation>错误: 你正在尝试发送消息到你自身或者一个频道, 但是你的加密密钥无法在文件keys.dat中找到. 无法加密消息. %1</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="681"/>
+        <source>Doing work necessary to send message.</source>
+        <translation>正在做一些必要的工作来发送消息.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="831"/>
+        <source>Message sent. Sent on %1</source>
+        <translation>消息已经发送. 发送于 %1</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="835"/>
+        <source>Message sent. Waiting for acknowledgement. Sent on %1</source>
+        <translation>消息已经发送. 正在等待回执. 发送于 %1</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="904"/>
+        <source>Doing work necessary to request encryption key.</source>
+        <translation>正在做一些必要的工作来请求加密密钥.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="928"/>
+        <source>Broacasting the public key request. This program will auto-retry if they are offline.</source>
+        <translation>正在广播公钥请求. 如果他们不在线, 这一过程将自动重试.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="929"/>
+        <source>Sending public key request. Waiting for reply. Requested at %1</source>
+        <translation>正在发送公钥请求. 等待回应中. 请求于 %1</translation>
+    </message>
 </context>
 <context>
     <name>NewAddressDialog</name>

From 03263156de8d18261a1683e25a11daf5d5313940 Mon Sep 17 00:00:00 2001
From: Neil Roberts <bpeeluk@yahoo.co.uk>
Date: Thu, 6 Feb 2014 13:16:07 +0000
Subject: [PATCH 11/20] Add a 'trustedpeer' option to keys.dat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If this option is specified in keys.dat then Bitmessage will connect
to the host specified there instead of connecting to the hosts in the
list of known nodes. It will also stop listening for incoming
connections and the timing attack mitigation will be disabled.

The expected use case is for example where a user is running a daemon
on a dedicated machine in their local network and they occasionally
want to check for messages using a second instance of the client on
their laptop. In that case it would be much faster to catch up with
the messages by directly downloading from the dedicated machine over
the LAN. There is no need to connect to multiple peers or to do the
timing attack mitigation because the daemon is trusted.

The host is specified as hostname:port. Eg, ‘192.168.1.8:8444’.
---
 src/class_outgoingSynSender.py | 25 ++++++++++++++++++-------
 src/class_receiveDataThread.py | 24 +++++++++++-------------
 src/class_singleListener.py    |  5 +++++
 src/helper_startup.py          | 13 +++++++++++++
 src/shared.py                  | 12 ++++++++++++
 5 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/src/class_outgoingSynSender.py b/src/class_outgoingSynSender.py
index f9343f62..fef781d3 100644
--- a/src/class_outgoingSynSender.py
+++ b/src/class_outgoingSynSender.py
@@ -22,26 +22,37 @@ class outgoingSynSender(threading.Thread):
         self.streamNumber = streamNumber
         self.selfInitiatedConnections = selfInitiatedConnections
 
+    def _getPeer(self):
+        # If the user has specified a trusted peer then we'll only
+        # ever connect to that. Otherwise we'll pick a random one from
+        # the known nodes
+        shared.knownNodesLock.acquire()
+        if shared.trustedPeer:
+            peer = shared.trustedPeer
+            shared.knownNodes[self.streamNumber][peer] = time.time()
+        else:
+            peer, = random.sample(shared.knownNodes[self.streamNumber], 1)
+        shared.knownNodesLock.release()
+
+        return peer
+
     def run(self):
         while shared.safeConfigGetBoolean('bitmessagesettings', 'dontconnect'):
             time.sleep(2)
         while shared.safeConfigGetBoolean('bitmessagesettings', 'sendoutgoingconnections'):
-            while len(self.selfInitiatedConnections[self.streamNumber]) >= 8:  # maximum number of outgoing connections = 8
+            maximumConnections = 1 if shared.trustedPeer else 8 # maximum number of outgoing connections = 8
+            while len(self.selfInitiatedConnections[self.streamNumber]) >= maximumConnections:
                 time.sleep(10)
             if shared.shutdown:
                 break
             random.seed()
-            shared.knownNodesLock.acquire()
-            peer, = random.sample(shared.knownNodes[self.streamNumber], 1)
-            shared.knownNodesLock.release()
+            peer = self._getPeer()
             shared.alreadyAttemptedConnectionsListLock.acquire()
             while peer in shared.alreadyAttemptedConnectionsList or peer.host in shared.connectedHostsList:
                 shared.alreadyAttemptedConnectionsListLock.release()
                 # print 'choosing new sample'
                 random.seed()
-                shared.knownNodesLock.acquire()
-                peer, = random.sample(shared.knownNodes[self.streamNumber], 1)
-                shared.knownNodesLock.release()
+                peer = self._getPeer()
                 time.sleep(1)
                 # Clear out the shared.alreadyAttemptedConnectionsList every half
                 # hour so that this program will again attempt a connection
diff --git a/src/class_receiveDataThread.py b/src/class_receiveDataThread.py
index 2551f223..31ddce14 100644
--- a/src/class_receiveDataThread.py
+++ b/src/class_receiveDataThread.py
@@ -313,6 +313,14 @@ class receiveDataThread(threading.Thread):
             print 'Sending huge inv message with', numberOfObjects, 'objects to just this one peer'
         self.sendDataThreadQueue.put((0, 'sendRawData', headerData + payload))
 
+    def _sleepForTimingAttackMitigation(self, sleepTime):
+        # We don't need to do the timing attack mitigation if we are
+        # only connected to the trusted peer because we can trust the
+        # peer not to attack
+        if sleepTime > 0 and doTimingAttackMitigation and shared.trustedPeer == None:
+            with shared.printLock:
+                print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.'
+            time.sleep(sleepTime)
 
     # We have received a broadcast message
     def recbroadcast(self, data):
@@ -341,10 +349,7 @@ class receiveDataThread(threading.Thread):
 
         sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \
             (time.time() - self.messageProcessingStartTime)
-        if sleepTime > 0 and doTimingAttackMitigation:
-            with shared.printLock:
-                print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.'
-            time.sleep(sleepTime)
+        self._sleepForTimingAttackMitigation(sleepTime)
 
     # We have received a msg message.
     def recmsg(self, data):
@@ -373,10 +378,7 @@ class receiveDataThread(threading.Thread):
 
         sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \
             (time.time() - self.messageProcessingStartTime)
-        if sleepTime > 0 and doTimingAttackMitigation:
-            with shared.printLock:
-                print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.'
-            time.sleep(sleepTime)
+        self._sleepForTimingAttackMitigation(sleepTime)
 
     # We have received a pubkey
     def recpubkey(self, data):
@@ -387,11 +389,7 @@ class receiveDataThread(threading.Thread):
         lengthOfTimeWeShouldUseToProcessThisMessage = .1
         sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \
             (time.time() - self.pubkeyProcessingStartTime)
-        if sleepTime > 0 and doTimingAttackMitigation:
-            with shared.printLock:
-                print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.'
-            time.sleep(sleepTime)
-
+        self._sleepForTimingAttackMitigation(sleepTime)
 
     # We have received an inv message
     def recinv(self, data):
diff --git a/src/class_singleListener.py b/src/class_singleListener.py
index ec1f47d4..49dbf9ce 100644
--- a/src/class_singleListener.py
+++ b/src/class_singleListener.py
@@ -22,6 +22,11 @@ class singleListener(threading.Thread):
         self.selfInitiatedConnections = selfInitiatedConnections
 
     def run(self):
+        # If there is a trusted peer then we don't want to accept
+        # incoming connections so we'll just abandon the thread
+        if shared.trustedPeer:
+            return
+
         while shared.safeConfigGetBoolean('bitmessagesettings', 'dontconnect'):
             time.sleep(1)
         helper_bootstrap.dns()
diff --git a/src/helper_startup.py b/src/helper_startup.py
index abc4958f..f9b2ff36 100644
--- a/src/helper_startup.py
+++ b/src/helper_startup.py
@@ -12,6 +12,17 @@ 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 _loadTrustedPeer():
+    try:
+        trustedPeer = shared.config.get('bitmessagesettings', 'trustedpeer')
+    except ConfigParser.Error:
+        # This probably means the trusted peer wasn't specified so we
+        # can just leave it as None
+        return
+
+    host, port = trustedPeer.split(':')
+    shared.trustedPeer = shared.Peer(host, int(port))
+
 def loadConfig():
     if shared.appdata:
         shared.config.read(shared.appdata + 'keys.dat')
@@ -122,6 +133,8 @@ def loadConfig():
         with open(shared.appdata + 'keys.dat', 'wb') as configfile:
             shared.config.write(configfile)
 
+    _loadTrustedPeer()
+
 def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
     try:
         VER_THIS=StrictVersion(platform.version())
diff --git a/src/shared.py b/src/shared.py
index e6642c70..1ce570d6 100644
--- a/src/shared.py
+++ b/src/shared.py
@@ -92,6 +92,18 @@ namecoinDefaultRpcPort = "8336"
 # binary distributions vs source distributions.
 frozen = getattr(sys,'frozen', None)
 
+# If the trustedpeer option is specified in keys.dat then this will
+# contain a Peer which will be connected to instead of using the
+# addresses advertised by other peers. The client will only connect to
+# this peer and the timing attack mitigation will be disabled in order
+# to download data faster. The expected use case is where the user has
+# a fast connection to a trusted server where they run a BitMessage
+# daemon permanently. If they then run a second instance of the client
+# on a local machine periodically when they want to check for messages
+# it will sync with the network a lot faster without compromising
+# security.
+trustedPeer = None
+
 def isInSqlInventory(hash):
     queryreturn = sqlQuery('''select hash from inventory where hash=?''', hash)
     return queryreturn != []

From a34442d6374884417bee3398944c1021024eec03 Mon Sep 17 00:00:00 2001
From: goldbook <goldbook@users.noreply.github.com>
Date: Fri, 7 Feb 2014 00:47:04 +0900
Subject: [PATCH 12/20] add more translation.

---
 src/translations/bitmessage_ja.qm | Bin 18960 -> 41102 bytes
 src/translations/bitmessage_ja.ts | 187 +++++++++++++++---------------
 2 files changed, 94 insertions(+), 93 deletions(-)

diff --git a/src/translations/bitmessage_ja.qm b/src/translations/bitmessage_ja.qm
index cd9798af939f1817018520f5e78721a2e722123e..6386a272ca8c676b22db6ce412e5b566c6a0959e 100644
GIT binary patch
literal 41102
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
W?`Gy`xmTaAcdB)BDZ|9?fd3!h94CAL

delta 1943
zcmZvceNa@_8OEQxd+&bT{cu50SX4CS!v#T<uN6TA42nREIv7VIAP@l+ObIQhxYn($
z0aWxF72G-)H8E(-lsjsS`Dn!$2UDtpXv`$(wpwhhVp<7KNmKd|{>|>}JZH~6=RNQH
zd!KXn{6W)lKyc4}uXJMf6Ym>;oEq|R(XkJ|$^dlWCk{yLqs|7BL_pjJ7`_IicY)wq
zU|}?%^#_)J3RqtTRyjG}2JuE1*Ns5D%Q<5q#78r!UyteRE=bLcHSQK9Zx-Me3(4(W
z4)`yIbmjz*(F%RR0wD7`><gX((-$EsxCfY!gQVLY@DH*NUK!19Ok)O-_r^CoU>EWZ
zny8(4p>i`YXD*g3DhEvSu(a+2YUh|n+fmS138bCGiVCiqC&T^Hr!K(m#A;n54-Uc0
z&q|n(giYTwV8R(}dCSd8e}}DAZNS_h9Il%T#5drktr@WN<BP7deD1<mjvSJjjiFBl
zfQjXTv3(HGrwCJmS+RM75NUo6h_nl{iXH;9?hEnT7;k=vTbN^K0Q&`D{^}%d)Cl>v
zxk2X<idMb}#2ga#1&}~snQ-K{%sAt!aOs4W=n8~~^=yrlEDZaIBjBDeqRHeSQZvIx
zk~W=Y_a-JXd9mhBLl=;`Nz*UZ0MXBD&CL=E&DC0Nb^;prRjqAjFCU!LhI-S0Ns-#b
z>TQ6lRy)7&E--C{_UM|O?6F7NeTXVQ(Dvxd=m*!B&U9!8>bQPtfEd`Z5^!XSsTZ<H
z>hEG^{yRX#TjF||1;#dtKmVQyMywKd*h$><rFeR;0J!yvcqaNJQC$_^^{k-j%0<;X
z9ti0YuhfUpOy?wPL;@>5E+u_)m?-y4u5R``!6nTpCy4-;wAgox#Fk0bM^(moBE7c7
z$%<9Uvz>{iTcpFT=|K2isqHBVBwv+|>|z{0oz&6P1vmVkNT-_`fbkQhv#(1Gq?O)Z
z7efymlWw%f6H$ir`3lYpf02f?L@TShqMsh+#dxG!_diyi*ruy(VQbPebSJ+26WyJv
z>j?db^HX)|9)G|Yue&fxEOw3VR)-%=m!kJ;p{H!g`jqS}4y51f^X{_8_O1FCFRx*R
z-TJb)3L@O7|5a`fP12};v;LP{r_rBozQ;ro#x&}4{e%3`%Ae|=h4H|!D~4p<zj#2O
zVS&}bL=z1wKRUqmhYj7Qt}y;m!*%y$dZg4awBuFYuE)ml{qAM#?PR0l?QgkpmoaH|
z345bA*5q@8(P?b!Bl-Y~(Hp|V;#!RDb4OT-&p4Ry9FYc^!aYnN&Tgvoaou$5m?lp$
zZB0(2m!6o;rVaDD^_niqgCu<3bkX~i@h+OWwyRW+EV%P%j=*@?SWiTTCOLeNm1uUz
z^ZZ$Ph#=?ZG}6?2#x!Za{Ne~rl{#H6*)pFmoXc|4W)A~r%Pk*&LG{UPy_xKBvFtU*
zvlZXT*S3@7lmhwMUq{dBlke6K@D@2`-!ZmE_lfL&<QD<V^vRDxE9v?Ub9(e>CCAM#
zHLNG9KbuRxEu`Dmnh(qi=Cx7G@6^4|78RO1M^Oefn9nD))AgeHy=szk{>FSssG)a$
zHm2#nHh(xipJu&pzEMe?F~xk-#ssXF%)L?EA3MoyG4!7!$|V-ZhI`ZzOL!{-$iJ}6
zP&#=3otDB=txU{kSwFN5_{o1Qn=|*4)FR96?ieC2vE1LgmX&X{{HHvfg=AZuqwfn-
zg*7Js2zy^*T{uL7t|)8!s$>$`W$lS2SsWkJsPKKZglo)X&Ia2HC(?L8p6zk~Go09O
z8{SRRrJpCi%ps+<DnuDDjZ-(un*=4!@=z(WW+{)Y|5QG+?^N>qKT~1?5>+wKA*iK6
z>4KW$SSWDXq69c6DE-bNr90}BdUM7&je32iUZWPzuGA<WB<3o%lmg{O%F@o%Fpc^w
zJwv0YS^rkPTNteLO$$&DWxuLb&MxjzdvgCKsKZOV2IcX}>q^<GYGuLNx0RDIQR?He
z9IdKU+|eq%CWm^i$|tIQHMxS4U00*lxE}~=t*2E`?(ED_E;p@@2uBvmuo1<mLMcb3
z2<5K=ukc%e64YV?UPHZ-)|{Z8-#wsFuI+nX>D!+vR4GA9mHN6etcjb2Wj{pNz_p<q
om7#{;VyxrnN296UgZ0AHX;_YG1~2|$+m9XkkG6ZtEA5g02hm6q*#H0l

diff --git a/src/translations/bitmessage_ja.ts b/src/translations/bitmessage_ja.ts
index b385e57d..95cd022e 100644
--- a/src/translations/bitmessage_ja.ts
+++ b/src/translations/bitmessage_ja.ts
@@ -102,72 +102,72 @@
     <message>
         <location filename="../bitmessageqt/__init__.py" line="398"/>
         <source>Since startup on %1</source>
-        <translation type="unfinished"></translation>
+        <translation>起動日時 %1</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>
+        <translation>暗号化キーを待っています。再度リクエストします。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="635"/>
         <source>Encryption key request queued.</source>
-        <translation type="unfinished"></translation>
+        <translation>暗号鍵のリクエストはキューに入りました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="638"/>
         <source>Queued.</source>
-        <translation type="unfinished"></translation>
+        <translation>キューに入りました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="641"/>
         <source>Message sent. Waiting on acknowledgement. Sent at %1</source>
-        <translation type="unfinished"></translation>
+        <translation>メッセージは送信されました。確認街です。送信先: %1</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="644"/>
         <source>Message sent. Sent at %1</source>
-        <translation type="unfinished"></translation>
+        <translation>メッセージは送信されました。送信先: %1</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>
+        <translation>送信のために処理を行う必要があります。処理はキューに入りました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="650"/>
         <source>Acknowledgement of the message received %1</source>
-        <translation type="unfinished"></translation>
+        <translation>メッセージの確認を受け取りました %1</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="653"/>
         <source>Broadcast queued.</source>
-        <translation type="unfinished"></translation>
+        <translation>Broadcastがキューに入りました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="656"/>
         <source>Broadcast on %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Broadcast: %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 type="unfinished"></translation>
+        <translation>問題: 受信者が要求している処理は現在あなたが設定しているよりも高い難易度です。 %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 type="unfinished"></translation>
+        <translation>問題: 受信者の暗号鍵は正当でない物です。メッセージを暗号化できません。 %1</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="665"/>
         <source>Forced difficulty override. Send should start soon.</source>
-        <translation type="unfinished"></translation>
+        <translation>難易度を強制上書きしました。まもなく送信されます。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="668"/>
         <source>Unknown status: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>不明なステータス: %1 %2</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1344"/>
@@ -177,12 +177,12 @@
     <message>
         <location filename="../bitmessageqt/__init__.py" line="821"/>
         <source>Show Bitmessage</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitmessageを表示</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="556"/>
         <source>Send</source>
-        <translation type="unfinished">送る</translation>
+        <translation>送る</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="836"/>
@@ -261,12 +261,12 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1217"/>
         <source>Address already present</source>
-        <translation type="unfinished"></translation>
+        <translation>アドレスは既に表示されています</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>
+        <translation>chanを追加できません。既にアドレス一覧に含まれています。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1222"/>
@@ -276,17 +276,17 @@ It is important that you back up this file. Would you like to open the file now?
     <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>
+        <translation>chanの作成に成功しました。他の人がchanに参加できるようにするには、chanの名前とBitmessageアドレスを伝えてください: %1　アドレスは「アドレス一覧」に表示されます。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1201"/>
         <source>Address too new</source>
-        <translation type="unfinished"></translation>
+        <translation>アドレスが新しすぎます</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>
+        <translation>このBitmessageアドレスは正当ですが、バージョン番号が現在使用中の物より新しいです。Bitmessageをアップデートしてください。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1205"/>
@@ -306,7 +306,7 @@ It is important that you back up this file. Would you like to open the file now?
     <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>
+        <translation>このBitmessageアドレスは正当ですが、chan名と一致していません。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1222"/>
@@ -316,17 +316,17 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1265"/>
         <source>Processed %1 person-to-person messages.</source>
-        <translation type="unfinished"></translation>
+        <translation>処理された1対1のメッセージ数 %1</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1270"/>
         <source>Processed %1 broadcast messages.</source>
-        <translation type="unfinished"></translation>
+        <translation>処理されたBroadcastmessage数 %1</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1275"/>
         <source>Processed %1 public keys.</source>
-        <translation type="unfinished"></translation>
+        <translation>処理された公開鍵数 %1</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1319"/>
@@ -351,42 +351,42 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1559"/>
         <source>Error: Bitmessage addresses start with BM-   Please check %1</source>
-        <translation type="unfinished"></translation>
+        <translation>エラー: Bitmessageアドレスは「BM-」で始まります。確認してください %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 type="unfinished"></translation>
+        <translation>エラー: アドレス %1 は正しく入力、またはコピーされていません。確認して下さい。</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>
+        <translation>エラー: アドレス %1 は不正な文字を含んでいます。確認して下さい。</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>
+        <translation>エラー: アドレスのバージョン %1 は現在使用中の物より新しいです。Bitmessageをアップデートする必要があるか、連絡先がより賢いです。</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>
+        <translation>エラー: アドレス %1 でエンコードされたデータが短すぎます。連絡先のソフトウェアが何かしら誤っている可能性があります。</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>
+        <translation>エラー: アドレス %1 でエンコードされたデータが長すぎます。連絡先のソフトウェアが何かしら誤っている可能性があります。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1577"/>
         <source>Error: Something is wrong with the address %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>エラー: アドレス %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"></translation>
+        <translation>エラー: 送信元アドレスを指定してください。まだ作成していない場合には「アドレス一覧」のタブを開いてください。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1588"/>
@@ -396,7 +396,7 @@ It is important that you back up this file. Would you like to open the file now?
     <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>
+        <translation>エラー: 送信先アドレス %1 は自分自身のアドレスです。Bitmessageクライアントは自分自身へのメッセージを処理できません。別のPCか仮想マシン上でクライアントを立ち上げてください。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1594"/>
@@ -406,7 +406,7 @@ It is important that you back up this file. Would you like to open the file now?
     <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>
+        <translation>アドレス %1 に接続。%2 のバージョン番号は処理できません。Bitmessageを最新のバージョンへアップデートしてください。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1598"/>
@@ -416,12 +416,12 @@ It is important that you back up this file. Would you like to open the file now?
     <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>
+        <translation>アドレス %1 に接続。%2 のストリーム番号は処理できません。Bitmessageを最新のバージョンへアップデートしてください。</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>
+        <translation>警告: 接続されていません。Bitmessageはメッセージの処理を行いますが、ネットワークに接続するまで送信はされません。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1640"/>
@@ -431,22 +431,22 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1695"/>
         <source>Work is queued.</source>
-        <translation type="unfinished"></translation>
+        <translation>処理がキューに入りました。</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>
+        <translation>アドレス帳から一つ、または複数のアドレスを右クリックして「このアドレスへ送信」を選んでください。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1728"/>
         <source>Fetched address from namecoin identity.</source>
-        <translation type="unfinished"></translation>
+        <translation>namecoin IDからアドレスを取得</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1805"/>
         <source>Work is queued. %1</source>
-        <translation type="unfinished"></translation>
+        <translation>処理がキューに入りました。 %1</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1874"/>
@@ -471,12 +471,12 @@ It is important that you back up this file. Would you like to open the file now?
     <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>
+        <translation>エラー: 同じアドレスを複数アドレス帳に追加する事はできません。既存の項目をリネームしてください。</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>
+        <translation>エラー: 同じアドレスを複数購読リストに追加する事はできません。既存の項目をリネームしてください。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2046"/>
@@ -491,12 +491,12 @@ It is important that you back up this file. Would you like to open the file now?
     <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>
+        <translation>プロキシの設定を有効にするには手動でBitmessageを再起動してください。既に接続がある場合は切断されます。</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>
+        <translation>エラー: 同じアドレスを複数リストに追加する事はできません。既存の項目をリネームしてください。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2280"/>
@@ -516,7 +516,7 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2283"/>
         <source>You really do need a passphrase.</source>
-        <translation type="unfinished"></translation>
+        <translation>パスフレーズが必要です。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2306"/>
@@ -526,7 +526,7 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2380"/>
         <source>Address is gone</source>
-        <translation type="unfinished"></translation>
+        <translation>アドレスが無効になりました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2380"/>
@@ -541,12 +541,12 @@ It is important that you back up this file. Would you like to open the file now?
     <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>
+        <translation>エラー: 送信しようとしたアドレスは無効になっています。使用する前に「アドレス一覧」で有効にしてください。</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>
+        <translation>アドレス帳に項目が追加されました。ラベルは自由に編集できます。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2502"/>
@@ -571,7 +571,7 @@ It is important that you back up this file. Would you like to open the file now?
     <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>
+        <translation>現在のOS上で未実装、または実装できないためオプションは無効化されました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3204"/>
@@ -581,7 +581,7 @@ It is important that you back up this file. Would you like to open the file now?
     <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>
+        <translation>chanアドレスは仮想メーリングリストのアドレスには使用できません。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3264"/>
@@ -606,12 +606,12 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3276"/>
         <source>Some data encoded in the address is too short.</source>
-        <translation type="unfinished"></translation>
+        <translation>このアドレスでエンコードされたデータが短すぎます。</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>
+        <translation>このアドレスでエンコードされたデータが長過ぎます。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3324"/>
@@ -671,7 +671,7 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="542"/>
         <source>Fetch Namecoin ID</source>
-        <translation type="unfinished"></translation>
+        <translation>namecoin IDを取得</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="543"/>
@@ -695,7 +695,7 @@ It is important that you back up this file. Would you like to open the file now?
 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>
+        <translation></translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="551"/>
@@ -715,7 +715,7 @@ p, li { white-space: pre-wrap; }
     <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>
+        <translation>broadcastはあなたのアドレスのみで暗号化されます。あなたのアドレスを知っている人は全て読むことができます。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="571"/>
@@ -725,7 +725,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="572"/>
         <source>Sent</source>
-        <translation type="unfinished">送信済み</translation>
+        <translation>送信済み</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="576"/>
@@ -750,7 +750,7 @@ p, li { white-space: pre-wrap; }
     <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>
+        <translation>他のユーザが送信した「broadcastメッセージ」を購読できます。メッセージは受信箱に表示されます。このリストのアドレスはブラックリストより優先されます。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="583"/>
@@ -770,7 +770,7 @@ p, li { white-space: pre-wrap; }
     <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>
+        <translation>アドレス帳は他のユーザのBitmessageアドレスにラベルや名前をつけることで受信箱を見やすくします。「追加」ボタンを押すか受信箱でメッセージを右クリックしてください。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="603"/>
@@ -810,22 +810,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="612"/>
         <source>Since startup at asdf:</source>
-        <translation type="unfinished"></translation>
+        <translation>起動してから asdf:</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="613"/>
         <source>Processed 0 person-to-person message.</source>
-        <translation type="unfinished"></translation>
+        <translation>処理された1対1のメッセージ数 0</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="614"/>
         <source>Processed 0 public key.</source>
-        <translation type="unfinished"></translation>
+        <translation>処理された公開鍵数 0</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="615"/>
         <source>Processed 0 broadcast.</source>
-        <translation type="unfinished"></translation>
+        <translation>処理されたBroadcastメッセージ数 0</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="616"/>
@@ -875,7 +875,8 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="628"/>
         <source>Regenerate deterministic addresses</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>「決定論的アドレス」ともヤクセルが</translatorcomment>
+        <translation>deterministiｃアドレスを再生成</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="629"/>
@@ -899,12 +900,12 @@ p, li { white-space: pre-wrap; }
         <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>
+        <translation>複数のアドレスを生成できます。アドレスを自由に生成、破棄することができます。アドレスは乱数かパスフレーズを使って生成できます。もしパスフレーズを使う場合、アドレスはdeterministicアドレスになります。デフォルトでは乱数による生成が選択されますが、deterministicアドレスにも長所と短所があります:</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>
+        <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;長所:&lt;br/&gt;&lt;/span&gt;記憶を頼りにアドレスを再生成できます。&lt;br/&gt;keys.datファイルのバックアップの心配をしないでも、パスフレーズを覚えておけばよくなります。&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;短所:&lt;br/&gt;&lt;/span&gt;アドレスの暗号鍵を紛失した場合に備えてアドレスを再生成出来るようにしたい場合、パスフレーズを覚えて（もしくは書き留めて）必要があります。&lt;br/&gt;パスフレーズを覚えておくのに加えて、アドレスのバージョン番号とストリーム番号も覚えておく必要があります。&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;</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="177"/>
@@ -969,12 +970,12 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="189"/>
         <source>Use the most available stream</source>
-        <translation type="unfinished"></translation>
+        <translation>最も有効なストリームを使う</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>
+        <translation>（もしこれから複数のアドレスを生成するのであれば、最初の一つに最適です。）</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="191"/>
@@ -1063,7 +1064,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <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>
+        <translation></translation>
     </message>
     <message>
         <location filename="../bitmessageqt/about.py" line="62"/>
@@ -1117,7 +1118,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <message>
         <location filename="../bitmessageqt/iconglossary.py" line="82"/>
         <source>Icon Glossary</source>
-        <translation type="unfinished"></translation>
+        <translation>アイコン一覧</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/iconglossary.py" line="83"/>
@@ -1142,7 +1143,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <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>
+        <translation>発信接続のために1つ以上のピアへ接続を行っていますが、まだ着信接続を受け取っていません。ファイアーウォールかホームルーターが外部からこのコンピューターへのTCP接続を受け取れるように設定されていないかも知れません。Bitmessageは正常に動作しますが、外部からの接続を許可してより良く接続されたノードになることはBitmessageネットワークへの助けになります。</translation>
     </message>
 </context>
 <context>
@@ -1170,7 +1171,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <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>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;chan名を入力してください。（強くて一意のパスフレーズのように）十分に複雑なchan名を選び、あなたの友人たちがそれを他人に教えない限りchanはセキュアでプライベートです。あなたと他の誰かが同じ名前のchanを作成した場合、現状では同じchanになる可能性が非常に高い。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newchandialog.py" line="105"/>
@@ -1180,12 +1181,12 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <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>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;chanは人々のグループに復号鍵を共有されることで存在します。chanで使われる鍵とBitmessageアドレスは読みやすい単語、またはフレーズ（chan名）から生成されます。chanに居る人たちへメッセージを送るには、通常の一対一のメッセージをchanアドレスへ送ります。&lt;/p&gt;&lt;p&gt;chansは実験的機能で、内容を管理するモデレーターを設けることはできません。&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 type="unfinished"></translation>
+        <translation>chanのbitmessageアドレス:</translation>
     </message>
 </context>
 <context>
@@ -1233,17 +1234,17 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <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"></translation>
+        <translation>アドレスを1、2文字短くするために数分間追加の計算処理を行う</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"></translation>
+        <translation>もしあなたが初めてアドレスを作ったのであればこのボックスをチェックする必要があります。（そうでない場合はしないでください）。</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"></translation>
+        <translation>もし以前にdeterministicアドレスを作ったことがあり、何かしらのトラブル（ハードディスクの故障のような）でそれを紛失していた場合、ここで再生成することができます。もし乱数でアドレスを作っていたのであればこのフォームは再生成には使えません。</translation>
     </message>
 </context>
 <context>
@@ -1356,42 +1357,42 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <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>
+        <translation>誰かがあなたにメッセージを送る時、相手のコンピューターはいくらか計算処理を行います。処理の難易度はデフォルトでは1です。この値を変更すると新しいアドレスではこのデフォルト値を引き上げることができます。その場合、新しいアドレスはメッセージの送信者により高い難易度を要求します。例外もあります: 友人や知り合いをアドレス帳に登録すると、Bitmessageは次にメッセージを送る際、自動的に要求される処理の難易度を最低限の1で済むように通知します。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="360"/>
         <source>Total difficulty:</source>
-        <translation type="unfinished">Total difficulty:</translation>
+        <translation>全体の難易度:</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="361"/>
         <source>Small message difficulty:</source>
-        <translation type="unfinished">Small message difficulty:</translation>
+        <translation>小さいメッセージの難易度:</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>
+        <translation>「小さいメッセージの難易度」は小さいメッセージを行う時にだけ影響します。この値を二倍にすれば小さなメッセージに必要な処理の難易度は二倍になりますが、実際にはデータ量の多いメッセージには影響しません。</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>
+        <translation>「全体の難易度」は完全に全てのメッセージに影響します。この値を二倍にすると処理量も二倍になります。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="364"/>
         <source>Demanded difficulty</source>
-        <translation type="unfinished">Demanded difficulty</translation>
+        <translation>要求される難易度</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>
+        <translation>携帯端末にメッセージを送る時は暗号化されていないアドレスを許可する</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>自動的に設定された言語・地域を上書きする（国コード、または言語コードを入力。例:「en_US」または「en」）</translation>
+        <translation>自動的に設定された言語・地域を上書きする（国コード、または言語コードを入力。例:「en_US」または「en」）:</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="357"/>
@@ -1401,27 +1402,27 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <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>
+        <translation>ここでは他のユーザーへメッセージを送る際に行うことを許可する処理量の上限を設定します。0を設定するとどんな量でも許容します。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="366"/>
         <source>Maximum acceptable total difficulty:</source>
-        <translation type="unfinished"></translation>
+        <translation>許可する難易度の上限:</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="367"/>
         <source>Maximum acceptable small message difficulty:</source>
-        <translation type="unfinished"></translation>
+        <translation>小さなメッセージに許可する難易度の上限:</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="368"/>
         <source>Max acceptable difficulty</source>
-        <translation type="unfinished"></translation>
+        <translation>許可する最大の難易度</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>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bitmessageはアドレスを読みやすくするため、NamecoinというBitcoinベースの別のプログラムを利用できます。例えば、あなたの友人に長いBitmessageアドレスを伝える代わりに、単純に&lt;span style=&quot; font-style:italic;&quot;&gt;テスト&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="370"/>
@@ -1446,17 +1447,17 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <message>
         <location filename="../bitmessageqt/settings.py" line="376"/>
         <source>Namecoind</source>
-        <translation type="unfinished"></translation>
+        <translation>Namecoind</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="377"/>
         <source>NMControl</source>
-        <translation type="unfinished"></translation>
+        <translation>NMControl</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="378"/>
         <source>Namecoin integration</source>
-        <translation type="unfinished"></translation>
+        <translation>Namecoin連携</translation>
     </message>
 </context>
 </TS>

From 61d4e0889f491477be42015b49f210f9925899c8 Mon Sep 17 00:00:00 2001
From: goldbook <goldbook@users.noreply.github.com>
Date: Sat, 8 Feb 2014 11:35:51 +0900
Subject: [PATCH 13/20] complete translation to japanese

---
 src/translations/bitmessage_ja.qm | Bin 41102 -> 41367 bytes
 src/translations/bitmessage_ja.ts |  32 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/translations/bitmessage_ja.qm b/src/translations/bitmessage_ja.qm
index 6386a272ca8c676b22db6ce412e5b566c6a0959e..0d78d13d3cfdb36cace31497c506fe601741935e 100644
GIT binary patch
delta 2978
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
NXPQk!A1|nL{TEwGZ@&Nl

delta 2926
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
U*qyV_OM=<fRcyBFN^1T73;8lDLI3~&

diff --git a/src/translations/bitmessage_ja.ts b/src/translations/bitmessage_ja.ts
index 95cd022e..da9edc69 100644
--- a/src/translations/bitmessage_ja.ts
+++ b/src/translations/bitmessage_ja.ts
@@ -316,17 +316,17 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1265"/>
         <source>Processed %1 person-to-person messages.</source>
-        <translation>処理された1対1のメッセージ数 %1</translation>
+        <translation>%1 通の1対1のメッセージを処理しました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1270"/>
         <source>Processed %1 broadcast messages.</source>
-        <translation>処理されたBroadcastmessage数 %1</translation>
+        <translation>%1 件のBroadcastメッセージを処理しました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1275"/>
         <source>Processed %1 public keys.</source>
-        <translation>処理された公開鍵数 %1</translation>
+        <translation>%1 件の公開鍵を処理しました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1319"/>
@@ -441,7 +441,7 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1728"/>
         <source>Fetched address from namecoin identity.</source>
-        <translation>namecoin IDからアドレスを取得</translation>
+        <translation>namecoin IDからアドレスを取得。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1805"/>
@@ -526,12 +526,12 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2380"/>
         <source>Address is gone</source>
-        <translation>アドレスが無効になりました。</translation>
+        <translation>アドレスが無効になりました</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2380"/>
         <source>Bitmessage cannot find your address %1. Perhaps you removed it?</source>
-        <translation>アドレス%1が見つかりません。既に削除されている可能性があります。</translation>
+        <translation>アドレス %1 が見つかりません。既に削除していませんか？</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2384"/>
@@ -616,7 +616,7 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3324"/>
         <source>You are using TCP port %1. (This can be changed in the settings).</source>
-        <translation>使用中のポート %1 （設定で変更できます）</translation>
+        <translation>使用中のポート %1 （設定で変更できます）。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="524"/>
@@ -815,17 +815,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="613"/>
         <source>Processed 0 person-to-person message.</source>
-        <translation>処理された1対1のメッセージ数 0</translation>
+        <translation>0 通の1対1のメッセージを処理しました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="614"/>
         <source>Processed 0 public key.</source>
-        <translation>処理された公開鍵数 0</translation>
+        <translation>0 件の公開鍵を処理しました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="615"/>
         <source>Processed 0 broadcast.</source>
-        <translation>処理されたBroadcastメッセージ数 0</translation>
+        <translation>0 件のBroadcastメッセージを処理しました。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="616"/>
@@ -905,7 +905,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <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">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;長所:&lt;br/&gt;&lt;/span&gt;記憶を頼りにアドレスを再生成できます。&lt;br/&gt;keys.datファイルのバックアップの心配をしないでも、パスフレーズを覚えておけばよくなります。&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;短所:&lt;br/&gt;&lt;/span&gt;アドレスの暗号鍵を紛失した場合に備えてアドレスを再生成出来るようにしたい場合、パスフレーズを覚えて（もしくは書き留めて）必要があります。&lt;br/&gt;パスフレーズを覚えておくのに加えて、アドレスのバージョン番号とストリーム番号も覚えておく必要があります。&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;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;長所:&lt;br/&gt;&lt;/span&gt;記憶を頼りにアドレスを再生成できます。&lt;br/&gt;keys.datファイルのバックアップの心配をしないでも、パスフレーズを覚えておけばよくなります。&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;短所:&lt;br/&gt;&lt;/span&gt;アドレスの暗号鍵を紛失した場合に備えてアドレスを再生成出来るようにしたい場合、パスフレーズを覚えて（もしくは書き留めて）必要があります。&lt;br/&gt;パスフレーズを覚えておくのに加えて、アドレスのバージョン番号とストリーム番号も覚えておく必要があります。&lt;br/&gt;弱いパスフレーズを設定すると、ネット上の誰かがブルートフォース攻撃を行ってあなたの送信メッセージ、受信メッセージを読んでしまう可能性があります。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="177"/>
@@ -920,12 +920,12 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <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>
+        <translation>アドレスを1、2文字短くするために数分間追加の計算処理を行う</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="180"/>
         <source>Make deterministic addresses</source>
-        <translation type="unfinished">Make deterministic arrddresses</translation>
+        <translation>deterministiｃアドレスを作る</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="181"/>
@@ -935,7 +935,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="182"/>
         <source>In addition to your passphrase, you must remember these numbers:</source>
-        <translation type="unfinished"></translation>
+        <translation>パスフレーズに加えて、これらの値を覚えておいてください:</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="183"/>
@@ -945,7 +945,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="184"/>
         <source>Number of addresses to make based on your passphrase:</source>
-        <translation>パスフレーズから生成されたアドレスの数</translation>
+        <translation>パスフレーズから生成されたアドレスの数:</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="185"/>
@@ -1133,7 +1133,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
     <message>
         <location filename="../bitmessageqt/iconglossary.py" line="85"/>
         <source>You are using TCP port ?. (This can be changed in the settings).</source>
-        <translation>使用中のポート ? （設定で変更できます）</translation>
+        <translation>使用中のポート ? （設定で変更できます）。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/iconglossary.py" line="86"/>

From cfb1c079c557d7a1d4e046a1f4d5fccc8bf9fef9 Mon Sep 17 00:00:00 2001
From: goldbook <goldbook@users.noreply.github.com>
Date: Sat, 8 Feb 2014 12:02:19 +0900
Subject: [PATCH 14/20] add language option

---
 src/bitmessageqt/settings.ui | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/bitmessageqt/settings.ui b/src/bitmessageqt/settings.ui
index 2af19613..f2195346 100644
--- a/src/bitmessageqt/settings.ui
+++ b/src/bitmessageqt/settings.ui
@@ -169,6 +169,12 @@
               <string comment="zh_cn">简体中文</string>
              </property>
             </item>
+            <item>
+            <item>
+             <property name="text">
+              <string comment="ja">日本語</string>
+             </property>
+            </item>
             <item>
              <property name="text">
               <string comment="en_pirate">Pirate English</string>

From fd6fd0719f16ebeeb7207d7aebe1d77087219e0f Mon Sep 17 00:00:00 2001
From: fyahfox <mt.k@gmx.de>
Date: Sat, 8 Feb 2014 17:46:17 +0100
Subject: [PATCH 15/20] Update bitmessage_de.ts

typo line 1296
---
 src/translations/bitmessage_de.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/translations/bitmessage_de.ts b/src/translations/bitmessage_de.ts
index 880c9e67..fbaaadb6 100644
--- a/src/translations/bitmessage_de.ts
+++ b/src/translations/bitmessage_de.ts
@@ -1293,7 +1293,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <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>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>
+        <translation>Sie haben mindestes eine Verbindung mit einem Netzwerkteilnehmer über eine ausgehende Verbindung, aber Sie haben noch keine eingehende Verbindung. Ihre Firewall oder Ihr Router ist vermutlich nicht richtig konfiguriert, um eingehende TCP-Verbindungen an Ihren Computer weiterzuleiten. Bitmessage 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="../bitmessageqt/iconglossary.py" line="85"/>

From ff36037df9799d619e103c09dad1fe321659b276 Mon Sep 17 00:00:00 2001
From: fyahfox <mt.k@gmx.de>
Date: Sat, 8 Feb 2014 18:40:02 +0100
Subject: [PATCH 16/20] Update bitmessage_de.ts

typo
---
 src/translations/bitmessage_de.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/translations/bitmessage_de.ts b/src/translations/bitmessage_de.ts
index fbaaadb6..1802cc5c 100644
--- a/src/translations/bitmessage_de.ts
+++ b/src/translations/bitmessage_de.ts
@@ -1537,12 +1537,12 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/settings.py" line="423"/>
         <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>
+            <translation>Die &quot;Schwierigkeit für kurze Nachrichten&quot; trifft nur auf das Senden kurzer Nachrichten zu. Verdoppelung dieses Wertes macht es fast doppelt so schwer, kurze Nachrichten zu senden, aber hat keinen Effekt bei langen Nachrichten.</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="420"/>
         <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>
+        <translation>Die &quot;Gesamtschwierigkeit&quot; beeinflusst die absolute Menge Arbeit, die ein Sender verrichten muss. Verdoppelung dieses Wertes verdoppelt die Menge der Arbeit.</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="424"/>
@@ -1557,7 +1557,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/settings.py" line="426"/>
         <source>Maximum acceptable total difficulty:</source>
-        <translation>Maximale akzeptierte Gesammtschwierigkeit:</translation>
+        <translation>Maximale akzeptierte Gesamtschwierigkeit:</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="427"/>
@@ -1572,7 +1572,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/settings.py" line="414"/>
         <source>Listen for incoming connections when using proxy</source>
-        <translation>Auf eingehende Verdindungen warten, auch wenn eine Proxy-Server verwendet wird</translation>
+        <translation>Auf eingehende Verdindungen warten, auch wenn ein Proxy-Server verwendet wird</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="391"/>
@@ -1582,7 +1582,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/settings.py" line="429"/>
         <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>
+        <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="../bitmessageqt/settings.py" line="430"/>

From 928d9501ccc3606361bef83e2779042de7f4ea3c Mon Sep 17 00:00:00 2001
From: fyahfox <mt.k@gmx.de>
Date: Sat, 8 Feb 2014 18:41:33 +0100
Subject: [PATCH 17/20] Update bitmessage_de.ts

---
 src/translations/bitmessage_de.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/translations/bitmessage_de.ts b/src/translations/bitmessage_de.ts
index 1802cc5c..d4d2ac3e 100644
--- a/src/translations/bitmessage_de.ts
+++ b/src/translations/bitmessage_de.ts
@@ -1537,7 +1537,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/settings.py" line="423"/>
         <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 kurzer Nachrichten zu. Verdoppelung dieses Wertes macht es fast doppelt so schwer, kurze Nachrichten zu senden, aber hat keinen Effekt bei langen Nachrichten.</translation>
+        <translation>Die &quot;Schwierigkeit für kurze Nachrichten&quot; trifft nur auf das Senden kurzer Nachrichten zu. Verdoppelung dieses Wertes macht es fast doppelt so schwer, kurze Nachrichten zu senden, aber hat keinen Effekt bei langen Nachrichten.</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="420"/>

From 272364ce7b78f4bdd3dedfc6b140eba1e3b7a3d6 Mon Sep 17 00:00:00 2001
From: fyahfox <mt.k@gmx.de>
Date: Sun, 9 Feb 2014 14:22:28 +0100
Subject: [PATCH 18/20] Update bitmessage_de.ts

added some translations
typo
---
 src/translations/bitmessage_de.ts | 48 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/translations/bitmessage_de.ts b/src/translations/bitmessage_de.ts
index d4d2ac3e..77b90908 100644
--- a/src/translations/bitmessage_de.ts
+++ b/src/translations/bitmessage_de.ts
@@ -5,17 +5,17 @@
     <message>
         <location filename="../bitmessageqt/addaddressdialog.py" line="62"/>
         <source>Add new entry</source>
-        <translation type="unfinished">Neuen Eintrag erstellen</translation>
+        <translation>Neuen Eintrag erstellen</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/addaddressdialog.py" line="63"/>
         <source>Label</source>
-        <translation type="unfinished"></translation>
+        <translation>Name oder Bezeichnung</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/addaddressdialog.py" line="64"/>
         <source>Address</source>
-        <translation type="unfinished">Adresse</translation>
+        <translation>Adresse</translation>
     </message>
 </context>
 <context>
@@ -153,7 +153,7 @@
     <message>
         <location filename="../bitmessageqt/__init__.py" line="850"/>
         <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>
+        <translation>Problem: Die vom Empfänger geforderte Arbeit ist schwerer als Sie bereit sind, zu berechnen. %1</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="853"/>
@@ -686,7 +686,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="601"/>
         <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>
+        <translation>Das Adressbuch ist nützlich, um die Bitmessage-Adressen anderer Personen Namen oder Beschreibungen zuzuordnen, sodass Sie sie einfacher im Posteingang erkennen können. Sie können Adressen über &quot;Neuen Eintrag erstellen&quot; hinzufügen, oder über einen Rechtsklick auf eine Nachricht im Posteingang.</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="614"/>
@@ -946,7 +946,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2998"/>
         <source>Set avatar...</source>
-        <translation type="unfinished"></translation>
+        <translation>Avatar wählen...</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1359"/>
@@ -966,7 +966,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../bitmessageqt/__init__.py" line="1519"/>
         <source>Inventory lookups per second: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Inventory lookups pro Sekunde: %1</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2286"/>
@@ -981,12 +981,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3005"/>
         <source>Do you really want to remove this avatar?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wollen Sie diesen Avatar wirklich entfernen?</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3013"/>
         <source>You have already set an avatar for this address. Do you really want to overwrite it?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben bereits einen Avatar für diese Adresse gewählt. Wollen Sie ihn wirklich überschreiben?</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3287"/>
@@ -1040,7 +1040,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="627"/>
         <source>Inventory lookups per second: 0</source>
-        <translation type="unfinished"></translation>
+        <translation>Inventory lookups pro Sekunde: 0</translation>
     </message>
 </context>
 <context>
@@ -1130,7 +1130,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <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>
+        <translation>(Zum Generieren der ersten Adresse empfohlen)</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="191"/>
@@ -1145,7 +1145,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/newaddressdialog.py" line="181"/>
         <source>Address version number: 4</source>
-        <translation type="unfinished">Adress-Versionsnummer: 4</translation>
+        <translation>Adress-Versionsnummer: 4</translation>
     </message>
 </context>
 <context>
@@ -1275,7 +1275,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <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>Bei Bitmessage handelt es sich um ein kollaboratives Projekt, Hilfe finden Sie online in Bitmessage-Wiki:</translation>
+        <translation>Bitmessage ist ein kollaboratives Projekt. Hilfe finden Sie online im Bitmessage-Wiki:</translation>
     </message>
 </context>
 <context>
@@ -1336,7 +1336,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <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;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>
+        <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 und völlig unmoderierbar.&lt;/p&gt;&lt;br&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/newchandialog.py" line="106"/>
@@ -1346,7 +1346,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <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;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>
+        <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 starken, 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>
 </context>
 <context>
@@ -1369,7 +1369,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/regenerateaddresses.py" line="117"/>
         <source>Number of addresses to make based on your passphrase:</source>
-        <translation>Anzahl der Adressen die basierend auf diesem Kennwortsatz erzeugt werden sollen:</translation>
+        <translation>Anzahl der Adressen, die basierend auf diesem Kennwortsatz erzeugt werden sollen:</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/regenerateaddresses.py" line="108"/>
@@ -1384,7 +1384,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/regenerateaddresses.py" line="119"/>
         <source>Stream number:</source>
-        <translation>Stream Nummer:</translation>
+        <translation>Stream-Nummer:</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/regenerateaddresses.py" line="120"/>
@@ -1394,7 +1394,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/regenerateaddresses.py" line="121"/>
         <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>
+        <translation>Verwenden Sie einige Minuten extra Rechenleistung, um die Adresse(n) ein bis zwei Zeichen kürzer zu machen</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/regenerateaddresses.py" line="122"/>
@@ -1404,12 +1404,12 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/regenerateaddresses.py" line="123"/>
         <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>
+        <translation>Wenn Sie bereits deterministische Adressen erstellt haben, aber diese durch einen Unfall (zum Beispiel durch eine defekte Festplatte) verloren haben, können Sie sie hier regenerieren. Dies funktioniert nur dann, wenn Sie bei der erstmaligen Erstellung Ihrer Adressen nicht den Zufallsgenerator verwendet haben.</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/regenerateaddresses.py" line="118"/>
         <source>Address version number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adress-Versionsnummer:</translation>
     </message>
 </context>
 <context>
@@ -1427,7 +1427,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/settings.py" line="386"/>
         <source>Start Bitmessage in the tray (don&apos;t show main window)</source>
-        <translation>Bitmessage minimiert starten (Zeigt das Hauptfenster nicht an)</translation>
+        <translation>Bitmessage minimiert starten (zeigt das Hauptfenster nicht an)</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="387"/>
@@ -1442,12 +1442,12 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/settings.py" line="389"/>
         <source>Run in Portable Mode</source>
-        <translation>In portablem Modus arbeiten</translation>
+        <translation>Im portablen Modus arbeiten</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="390"/>
         <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>
+        <translation>Im portablen Modus werden Nachrichten und Konfigurationen im gleichen Ordner abgelegt, in dem sich das Programm selbst befindet (anstatt im normalen Anwendungsdaten-Ordner). Das macht es möglich, Bitmessage auf einem USB-Stick zu betreiben.</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/settings.py" line="404"/>
@@ -1522,7 +1522,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/settings.py" line="422"/>
         <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>
+        <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="../bitmessageqt/settings.py" line="419"/>

From 12d131f7f2f7c6e0c65a1d0a5f071eafe119d9ae Mon Sep 17 00:00:00 2001
From: Jonathan Warren <me@jonwarren.org>
Date: Wed, 30 Apr 2014 12:44:16 -0400
Subject: [PATCH 19/20] Fixed minor label problem during init

---
 src/bitmessageqt/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 7125cb60..c20d955b 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -771,7 +771,7 @@ class MyForm(QtGui.QMainWindow):
 
             if shared.config.has_section(fromAddress):
                 fromLabel = shared.config.get(fromAddress, 'label')
-            if fromLabel == '':
+            else:
                 fromLabel = fromAddress
 
             toLabel = ''

From 22934441dc93b05058aa8d9c67fd2235d19c6400 Mon Sep 17 00:00:00 2001
From: Jonathan Warren <me@jonwarren.org>
Date: Wed, 30 Apr 2014 15:39:25 -0400
Subject: [PATCH 20/20] Fix #662 - 'PyBitmessage does not wait for verack'

---
 src/class_receiveDataThread.py | 125 +++++++++++++++++++--------------
 src/class_sendDataThread.py    |  65 ++++++-----------
 src/defaultKnownNodes.py       |  22 +++---
 3 files changed, 105 insertions(+), 107 deletions(-)

diff --git a/src/class_receiveDataThread.py b/src/class_receiveDataThread.py
index 127f18a4..62a6a99d 100644
--- a/src/class_receiveDataThread.py
+++ b/src/class_receiveDataThread.py
@@ -147,9 +147,9 @@ class receiveDataThread(threading.Thread):
         with shared.printLock:
             print 'remoteCommand', repr(remoteCommand.replace('\x00', '')), ' from', self.peer
 
-        if remoteCommand == 'version\x00\x00\x00\x00\x00':
+        if remoteCommand == 'version\x00\x00\x00\x00\x00' and not self.connectionIsOrWasFullyEstablished:
             self.recversion(self.data[24:self.payloadLength + 24])
-        elif remoteCommand == 'verack\x00\x00\x00\x00\x00\x00':
+        elif remoteCommand == 'verack\x00\x00\x00\x00\x00\x00' and not self.connectionIsOrWasFullyEstablished:
             self.recverack()
         elif remoteCommand == 'addr\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
             self.recaddr(self.data[24:self.payloadLength + 24])
@@ -237,7 +237,12 @@ class receiveDataThread(threading.Thread):
             self.connectionFullyEstablished()
 
     def connectionFullyEstablished(self):
+        if self.connectionIsOrWasFullyEstablished:
+            # there is no reason to run this function a second time
+            return
         self.connectionIsOrWasFullyEstablished = True
+        # Command the corresponding sendDataThread to set its own connectionIsOrWasFullyEstablished variable to True also
+        self.sendDataThreadQueue.put((0, 'connectionIsOrWasFullyEstablished', 'no data'))
         if not self.initiatedConnection:
             shared.clientHasReceivedIncomingConnections = True
             shared.UISignalQueue.put(('setStatusIcon', 'green'))
@@ -301,8 +306,9 @@ class receiveDataThread(threading.Thread):
             self.sendinvMessageToJustThisOnePeer(
                 numberOfObjectsInInvMessage, payload)
 
-    # Self explanatory. Notice that there is also a broadcastinv function for
-    # broadcasting invs to everyone in our stream.
+    # Used to send a big inv message when the connection with a node is 
+    # first fully established. Notice that there is also a broadcastinv 
+    # function for broadcasting invs to everyone in our stream.
     def sendinvMessageToJustThisOnePeer(self, numberOfObjects, payload):
         payload = encodeVarint(numberOfObjects) + payload
         headerData = '\xe9\xbe\xb4\xd9'  # magic bits, slighly different from Bitcoin's magic bits.
@@ -665,7 +671,10 @@ class receiveDataThread(threading.Thread):
             print 'knownNodes currently has', len(shared.knownNodes[self.streamNumber]), 'nodes for this stream.'
 
 
-    # Send a big addr message to our peer
+    # Send a huge addr message to our peer. This is only used 
+    # when we fully establish a connection with a 
+    # peer (with the full exchange of version and verack 
+    # messages).
     def sendaddr(self):
         addrsInMyStream = {}
         addrsInChildStreamLeft = {}
@@ -750,58 +759,68 @@ class receiveDataThread(threading.Thread):
         if len(data) < 83:
             # This version message is unreasonably short. Forget it.
             return
-        elif not self.verackSent:
-            self.remoteProtocolVersion, = unpack('>L', data[:4])
-            if self.remoteProtocolVersion <= 1:
-                shared.broadcastToSendDataQueues((0, 'shutdown', self.peer))
-                with shared.printLock:
-                    print 'Closing connection to old protocol version 1 node: ', self.peer
-                return
-            # print 'remoteProtocolVersion', self.remoteProtocolVersion
-            self.myExternalIP = socket.inet_ntoa(data[40:44])
-            # print 'myExternalIP', self.myExternalIP
-            self.remoteNodeIncomingPort, = unpack('>H', data[70:72])
-            # print 'remoteNodeIncomingPort', self.remoteNodeIncomingPort
-            useragentLength, lengthOfUseragentVarint = decodeVarint(
-                data[80:84])
-            readPosition = 80 + lengthOfUseragentVarint
-            useragent = data[readPosition:readPosition + useragentLength]
-            readPosition += useragentLength
-            numberOfStreamsInVersionMessage, lengthOfNumberOfStreamsInVersionMessage = decodeVarint(
-                data[readPosition:])
-            readPosition += lengthOfNumberOfStreamsInVersionMessage
-            self.streamNumber, lengthOfRemoteStreamNumber = decodeVarint(
-                data[readPosition:])
+        if self.verackSent:
+            """
+            We must have already processed the remote node's version message.
+            There might be a time in the future when we Do want to process
+            a new version message, like if the remote node wants to update
+            the streams in which they are interested. But for now we'll
+            ignore this version message
+            """ 
+            return
+        self.remoteProtocolVersion, = unpack('>L', data[:4])
+        if self.remoteProtocolVersion <= 1:
+            shared.broadcastToSendDataQueues((0, 'shutdown', self.peer))
             with shared.printLock:
-                print 'Remote node useragent:', useragent, '  stream number:', self.streamNumber
+                print 'Closing connection to old protocol version 1 node: ', self.peer
+            return
+        # print 'remoteProtocolVersion', self.remoteProtocolVersion
+        self.myExternalIP = socket.inet_ntoa(data[40:44])
+        # print 'myExternalIP', self.myExternalIP
+        self.remoteNodeIncomingPort, = unpack('>H', data[70:72])
+        # print 'remoteNodeIncomingPort', self.remoteNodeIncomingPort
+        useragentLength, lengthOfUseragentVarint = decodeVarint(
+            data[80:84])
+        readPosition = 80 + lengthOfUseragentVarint
+        useragent = data[readPosition:readPosition + useragentLength]
+        readPosition += useragentLength
+        numberOfStreamsInVersionMessage, lengthOfNumberOfStreamsInVersionMessage = decodeVarint(
+            data[readPosition:])
+        readPosition += lengthOfNumberOfStreamsInVersionMessage
+        self.streamNumber, lengthOfRemoteStreamNumber = decodeVarint(
+            data[readPosition:])
+        with shared.printLock:
+            print 'Remote node useragent:', useragent, '  stream number:', self.streamNumber
 
-            if self.streamNumber != 1:
-                shared.broadcastToSendDataQueues((0, 'shutdown', self.peer))
-                with shared.printLock:
-                    print 'Closed connection to', self.peer, 'because they are interested in stream', self.streamNumber, '.'
-                return
-            shared.connectedHostsList[
-                self.peer.host] = 1  # We use this data structure to not only keep track of what hosts we are connected to so that we don't try to connect to them again, but also to list the connections count on the Network Status tab.
-            # If this was an incoming connection, then the sendData thread
-            # doesn't know the stream. We have to set it.
-            if not self.initiatedConnection:
-                shared.broadcastToSendDataQueues((
-                    0, 'setStreamNumber', (self.peer, self.streamNumber)))
-            if data[72:80] == shared.eightBytesOfRandomDataUsedToDetectConnectionsToSelf:
-                shared.broadcastToSendDataQueues((0, 'shutdown', self.peer))
-                with shared.printLock:
-                    print 'Closing connection to myself: ', self.peer
-                return
-            self.sendDataThreadQueue.put((0, 'setRemoteProtocolVersion', self.remoteProtocolVersion))
+        if self.streamNumber != 1:
+            shared.broadcastToSendDataQueues((0, 'shutdown', self.peer))
+            with shared.printLock:
+                print 'Closed connection to', self.peer, 'because they are interested in stream', self.streamNumber, '.'
+            return
+        shared.connectedHostsList[
+            self.peer.host] = 1  # We use this data structure to not only keep track of what hosts we are connected to so that we don't try to connect to them again, but also to list the connections count on the Network Status tab.
+        # If this was an incoming connection, then the sendData thread
+        # doesn't know the stream. We have to set it.
+        if not self.initiatedConnection:
+            self.sendDataThreadQueue.put((0, 'setStreamNumber', self.streamNumber))
+        if data[72:80] == shared.eightBytesOfRandomDataUsedToDetectConnectionsToSelf:
+            shared.broadcastToSendDataQueues((0, 'shutdown', self.peer))
+            with shared.printLock:
+                print 'Closing connection to myself: ', self.peer
+            return
+        
+        # The other peer's protocol version is of interest to the sendDataThread but we learn of it
+        # in this version message. Let us inform the sendDataThread.
+        self.sendDataThreadQueue.put((0, 'setRemoteProtocolVersion', self.remoteProtocolVersion))
 
-            shared.knownNodesLock.acquire()
-            shared.knownNodes[self.streamNumber][shared.Peer(self.peer.host, self.remoteNodeIncomingPort)] = int(time.time())
-            shared.needToWriteKnownNodesToDisk = True
-            shared.knownNodesLock.release()
+        shared.knownNodesLock.acquire()
+        shared.knownNodes[self.streamNumber][shared.Peer(self.peer.host, self.remoteNodeIncomingPort)] = int(time.time())
+        shared.needToWriteKnownNodesToDisk = True
+        shared.knownNodesLock.release()
 
-            self.sendverack()
-            if self.initiatedConnection == False:
-                self.sendversion()
+        self.sendverack()
+        if self.initiatedConnection == False:
+            self.sendversion()
 
     # Sends a version message
     def sendversion(self):
diff --git a/src/class_sendDataThread.py b/src/class_sendDataThread.py
index 7cb20c59..1d67e97f 100644
--- a/src/class_sendDataThread.py
+++ b/src/class_sendDataThread.py
@@ -25,6 +25,7 @@ class sendDataThread(threading.Thread):
         self.data = ''
         self.objectHashHolderInstance = objectHashHolder(self.sendDataThreadQueue)
         self.objectHashHolderInstance.start()
+        self.connectionIsOrWasFullyEstablished = False
 
 
     def setup(
@@ -71,16 +72,6 @@ class sendDataThread(threading.Thread):
                     if data == self.peer or data == 'all':
                         with shared.printLock:
                             print 'sendDataThread (associated with', self.peer, ') ID:', id(self), 'shutting down now.'
-
-                        try:
-                            self.sock.shutdown(socket.SHUT_RDWR)
-                            self.sock.close()
-                        except:
-                            pass
-                        shared.sendDataQueues.remove(self.sendDataThreadQueue)
-                        with shared.printLock:
-                            print 'len of sendDataQueues', len(shared.sendDataQueues)
-
                         break
                 # When you receive an incoming connection, a sendDataThread is
                 # created even though you don't yet know what stream number the
@@ -89,12 +80,9 @@ class sendDataThread(threading.Thread):
                 # will continue on with the connection and will set the
                 # streamNumber of this send data thread here:
                 elif command == 'setStreamNumber':
-                    peerInMessage, specifiedStreamNumber = data
-                    if peerInMessage == self.peer:
-                        with shared.printLock:
-                            print 'setting the stream number in the sendData thread (ID:', id(self), ') to', specifiedStreamNumber
-
-                        self.streamNumber = specifiedStreamNumber
+                    self.streamNumber = data
+                    with shared.printLock:
+                        print 'setting the stream number in the sendData thread (ID:', id(self), ') to', self.streamNumber 
                 elif command == 'setRemoteProtocolVersion':
                     specifiedRemoteProtocolVersion = data
                     with shared.printLock:
@@ -103,6 +91,9 @@ class sendDataThread(threading.Thread):
                 elif command == 'advertisepeer':
                     self.objectHashHolderInstance.holdPeer(data)
                 elif command == 'sendaddr':
+                    if not self.connectionIsOrWasFullyEstablished:
+                        # not sending addr because we haven't sent and heard a verack from the remote node yet
+                        return
                     numberOfAddressesInAddrMessage = len(
                         data)
                     payload = ''
@@ -127,17 +118,13 @@ class sendDataThread(threading.Thread):
                         self.lastTimeISentData = int(time.time())
                     except:
                         print 'sendaddr: self.sock.sendall failed'
-                        try:
-                            self.sock.shutdown(socket.SHUT_RDWR)
-                            self.sock.close()
-                        except:
-                            pass
-                        shared.sendDataQueues.remove(self.sendDataThreadQueue)
-                        print 'sendDataThread thread (ID:', str(id(self)) + ') ending now. Was connected to', self.peer
                         break
                 elif command == 'advertiseobject':
                     self.objectHashHolderInstance.holdHash(data)
                 elif command == 'sendinv':
+                    if not self.connectionIsOrWasFullyEstablished:
+                        # not sending inv because we haven't sent and heard a verack from the remote node yet
+                        return
                     payload = ''
                     for hash in data:
                         if hash not in self.someObjectsOfWhichThisRemoteNodeIsAlreadyAware:
@@ -153,13 +140,6 @@ class sendDataThread(threading.Thread):
                             self.lastTimeISentData = int(time.time())
                         except:
                             print 'sendinv: self.sock.sendall failed'
-                            try:
-                                self.sock.shutdown(socket.SHUT_RDWR)
-                                self.sock.close()
-                            except:
-                                pass
-                            shared.sendDataQueues.remove(self.sendDataThreadQueue)
-                            print 'sendDataThread thread (ID:', str(id(self)) + ') ending now. Was connected to', self.peer
                             break
                 elif command == 'pong':
                     self.someObjectsOfWhichThisRemoteNodeIsAlreadyAware.clear() # To save memory, let us clear this data structure from time to time. As its function is to help us keep from sending inv messages to peers which sent us the same inv message mere seconds earlier, it will be fine to clear this data structure from time to time.
@@ -174,29 +154,28 @@ class sendDataThread(threading.Thread):
                             self.lastTimeISentData = int(time.time())
                         except:
                             print 'send pong failed'
-                            try:
-                                self.sock.shutdown(socket.SHUT_RDWR)
-                                self.sock.close()
-                            except:
-                                pass
-                            shared.sendDataQueues.remove(self.sendDataThreadQueue)
-                            print 'sendDataThread thread', self, 'ending now. Was connected to', self.peer
                             break
                 elif command == 'sendRawData':
                     try:
                         self.sock.sendall(data)
                         self.lastTimeISentData = int(time.time())
                     except:
-                        try:
-                            self.sock.shutdown(socket.SHUT_RDWR)
-                            self.sock.close()
-                        except:
-                            pass
-                        shared.sendDataQueues.remove(self.sendDataThreadQueue)
                         print 'Sending of data to', self.peer, 'failed. sendDataThread thread', self, 'ending now.' 
                         break
+                elif command == 'connectionIsOrWasFullyEstablished':
+                    with shared.printLock:
+                        print 'sendDataThread (associated with', self.peer, ') ID:', id(self), 'setting connectionIsOrWasFullyEstablished to True.'
+                    self.connectionIsOrWasFullyEstablished = True
             else:
                 with shared.printLock:
                     print 'sendDataThread ID:', id(self), 'ignoring command', command, 'because the thread is not in stream', deststream
 
+        try:
+            self.sock.shutdown(socket.SHUT_RDWR)
+            self.sock.close()
+        except:
+            pass
+        shared.sendDataQueues.remove(self.sendDataThreadQueue)
+        with shared.printLock:
+            print 'Number of queues remaining in sendDataQueues:', len(shared.sendDataQueues)
         self.objectHashHolderInstance.close()
diff --git a/src/defaultKnownNodes.py b/src/defaultKnownNodes.py
index 201e913d..bf98c351 100644
--- a/src/defaultKnownNodes.py
+++ b/src/defaultKnownNodes.py
@@ -11,17 +11,17 @@ def createDefaultKnownNodes(appdata):
     ############## Stream 1 ################
     stream1 = {}
 
-    stream1[shared.Peer('176.31.246.114', 8444)] = int(time.time())
-    stream1[shared.Peer('109.229.197.133', 8444)] = int(time.time())
-    stream1[shared.Peer('174.3.101.111', 8444)] = int(time.time())
-    stream1[shared.Peer('90.188.238.79', 7829)] = int(time.time())
-    stream1[shared.Peer('184.75.69.2', 8444)] = int(time.time())
-    stream1[shared.Peer('60.225.209.243', 8444)] = int(time.time())
-    stream1[shared.Peer('5.145.140.218', 8444)] = int(time.time())
-    stream1[shared.Peer('5.19.255.216', 8444)] = int(time.time())
-    stream1[shared.Peer('193.159.162.189', 8444)] = int(time.time())
-    stream1[shared.Peer('86.26.15.171', 8444)] = int(time.time())
-
+    #stream1[shared.Peer('2604:2000:1380:9f:82e:148b:2746:d0c7', 8080)] = int(time.time())
+    stream1[shared.Peer('68.33.0.104', 8444)] = int(time.time())
+    stream1[shared.Peer('97.77.34.35', 8444)] = int(time.time())
+    stream1[shared.Peer('71.232.195.131', 8444)] = int(time.time())
+    stream1[shared.Peer('192.241.231.39', 8444)] = int(time.time())
+    stream1[shared.Peer('75.66.0.116', 8444)] = int(time.time())
+    stream1[shared.Peer('182.169.23.102', 8444)] = int(time.time())
+    stream1[shared.Peer('75.95.134.9', 8444)] = int(time.time())
+    stream1[shared.Peer('46.236.100.108', 48444)] = int(time.time())
+    stream1[shared.Peer('66.108.53.42', 8080)] = int(time.time())
+    
     ############# Stream 2 #################
     stream2 = {}
     # None yet