Bitmessage/PyBitmessage-2024-11-30
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Conversation 0 Commits 399 Files Changed 133 +17 -6
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 10a3d2d28a - Show all commits

1
src/translations/bitmessage.pro
View File

@ -16,6 +16,7 @@ SOURCES = ../addresses.py\
../helper_sent.py\ ../helper_sent.py\
../helper_startup.py\ ../helper_startup.py\
../shared.py\ ../shared.py\
../upnp.py\
../bitmessageqt/__init__.py\ ../bitmessageqt/__init__.py\
../bitmessageqt/about.py\ ../bitmessageqt/about.py\
../bitmessageqt/account.py\ ../bitmessageqt/account.py\

22
src/translations/bitmessage_en.ts
View File

@ -83,7 +83,7 @@ Please type the desired email address (including @mailchuck.com) below:</source>
<context> <context>
<name>Mailchuck</name> <name>Mailchuck</name>
<message> <message>
<location filename="../bitmessageqt/account.py" line="220"/> <location filename="../bitmessageqt/account.py" line="225"/>
<source># You can use this to configure your email gateway account <source># You can use this to configure your email gateway account
# Uncomment the setting you want to use # Uncomment the setting you want to use
# Here are the options: # Here are the options:
@ -1258,6 +1258,16 @@ Receiver&apos;s required difficulty: %1 and %2</source>
<source>Sending public key request. Waiting for reply. Requested at %1</source> <source>Sending public key request. Waiting for reply. Requested at %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../upnp.py" line="217"/>
<source>UPnP port mapping established on port %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../upnp.py" line="241"/>
<source>UPnP port mapping removed</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>NewAddressDialog</name> <name>NewAddressDialog</name>
@ -1426,11 +1436,6 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
<source>version ?</source> <source>version ?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../bitmessageqt/about.py" line="69"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright &#xc2;&#xa9; 2012-2014 Jonathan Warren&lt;br/&gt;Copyright &#xc2;&#xa9; 2013-2014 The Bitmessage Developers&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../bitmessageqt/about.py" line="70"/> <location filename="../bitmessageqt/about.py" line="70"/>
<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> <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>
@ -1441,6 +1446,11 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
<source>This is Beta software.</source> <source>This is Beta software.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../bitmessageqt/about.py" line="69"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright &#xc2;&#xa9; 2012-2016 Jonathan Warren&lt;br/&gt;Copyright &#xc2;&#xa9; 2013-2016 The Bitmessage Developers&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>blacklist</name> <name>blacklist</name>