m

README.md

@@ -1,6 +1,7 @@
 PyBitmessage
-============
+-----------
 
+<<<<<<< HEAD
 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
@@ -8,15 +9,18 @@ authorities. It uses strong authentication, which means that the sender of a
 message cannot be spoofed, and it aims to hide metadata, like the
 sender and receiver of messages, from passive eavesdroppers like those running
 warrantless wiretapping programs.
+=======
+Bitmessage is a peer-to-peer communication protocol used to send encrypted messages to another single person or to multiple subscribers. It is decentralized and trustless, meaning that one needs not inherently trust any entities such as root certificate authorities. Bitmessage uses strong authentication, meaning that the sender of a message cannot be spoofed. It aims to hide meta-data, such as the ID of sender and receiver of messages from passive eavesdroppers like those warrantless wiretapping programs which are ongoing. 
+>>>>>>> refs/remotes/origin/rewording
 
 
 Development
 ----------
-Bitmessage is a collaborative project. You are welcome to submit pull requests 
-although if you plan to put a non-trivial amount of work into coding new
-features, it is recommended that you first solicit feedback on the DevTalk
-pseudo-mailing list:
-BM-2D9QKN4teYRvoq2fyzpiftPh9WP9qggtzh
+
+Bitmessage is a collaborative project. You are welcome to submit pull requests - although if you plan to put a non-trivial amount of work into coding new features, it is recommended that you first solicit feedback on the DevTalk pseudo-mailing-list ("subscribe"): http://bm6hsivrmdnxmw2f.onion/chan/DevTalk 
+
+Feel welcome to join chan "bitmessage", BM-2cWy7cvHoq3f1rYMerRJp8PT653jjSuEdY 
+which is on preview here: http://beamstat.com/chan/bitmessage
 
 
 References

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-merlot

build/notes.txt

@@ -0,0 +1,9 @@
+just a scratchpad.
+
+Z. 3 änd
+include BM API stuff
+
+keys.dat example with all switches also from bmcli.py
+
+ 
+Z9 online Änd. 1

dev/notes

@@ -1 +1 @@
-                                                          
+                                                                

src/bitmessageqt/__init__.py

@@ -3873,7 +3873,7 @@ class MyForm(settingsmixin.SMainWindow):
         else:
             data = self.getCurrentMessageId()
             if data != False:
-                message = "Error occurred: could not load message from disk."
+                message = "Error occurred: could not load message from disk." #### TODO: _translate( this ! happens frequently
         messageTextedit.setCurrentFont(QtGui.QFont())
         messageTextedit.setTextColor(QtGui.QColor())
         messageTextedit.setContent(message)