From e9f62efa4bd7201bf8b9ee079c2a30455462ecdc Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Thu, 24 Mar 2016 23:05:16 +0100 Subject: [PATCH] Default compose body "untranslate" There is no reason to retranslate the default message/broadcast body, and the default was just confusing HTML with no content. --- src/bitmessageqt/bitmessageui.py | 12 +---- src/translations/bitmessage_en.ts | 73 ++++++++++++++----------------- 2 files changed, 34 insertions(+), 51 deletions(-) diff --git a/src/bitmessageqt/bitmessageui.py b/src/bitmessageqt/bitmessageui.py index 5a8ae31f..6f50f7a1 100644 --- a/src/bitmessageqt/bitmessageui.py +++ b/src/bitmessageqt/bitmessageui.py @@ -671,19 +671,11 @@ class Ui_MainWindow(object): self.label_3.setText(_translate("MainWindow", "Subject:", None)) self.label_2.setText(_translate("MainWindow", "From:", None)) self.label.setText(_translate("MainWindow", "To:", None)) - self.textEditMessage.setHtml(_translate("MainWindow", "\n" -"\n" -"


", None)) + #self.textEditMessage.setHtml("") self.tabWidgetSend.setTabText(self.tabWidgetSend.indexOf(self.sendDirect), _translate("MainWindow", "Send ordinary Message", None)) self.label_8.setText(_translate("MainWindow", "From:", None)) self.label_7.setText(_translate("MainWindow", "Subject:", None)) - self.textEditMessageBroadcast.setHtml(_translate("MainWindow", "\n" -"\n" -"


", None)) + #self.textEditMessageBroadcast.setHtml("") self.tabWidgetSend.setTabText(self.tabWidgetSend.indexOf(self.sendBroadcast), _translate("MainWindow", "Send Message to your Subscribers", None)) self.pushButtonTTL.setText(_translate("MainWindow", "TTL:", None)) self.labelHumanFriendlyTTLDescription.setText(_translate("MainWindow", "X days", None)) diff --git a/src/translations/bitmessage_en.ts b/src/translations/bitmessage_en.ts index 2d24a692..aca9387b 100644 --- a/src/translations/bitmessage_en.ts +++ b/src/translations/bitmessage_en.ts @@ -335,7 +335,7 @@ Please type the desiged email address (including @mailchuck.com) below: - + Send @@ -350,7 +350,7 @@ Please type the desiged email address (including @mailchuck.com) below: - + Quit @@ -906,37 +906,37 @@ Are you sure you want to delete the channel? - + Search - + All - + To - + From - + Subject - + Message - + Received @@ -966,12 +966,12 @@ Are you sure you want to delete the channel? - + Subject: - + From: @@ -981,116 +981,107 @@ Are you sure you want to delete the channel? - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Droid Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2';"><br /></p></body></html> - - - - + Send ordinary Message - + Send Message to your Subscribers - + TTL: - + X days - + Subscriptions - + Add new Subscription - + Chans - + Add Chan - + Network Status - + File - + Settings - + Help - + Import keys - + Manage keys - + Ctrl+Q - + F1 - + Contact support - + About - + Regenerate deterministic addresses - + Delete all trashed messages - + Join / Create chan