URI: 
       tMerge pull request #367 from rdymac/split-colon - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit 325efed9ac6ccf2cec8df62655c5a44a14dccc6e
   DIR parent faa93e30106278d0c3f6f0d05944af7d94ac95f7
  HTML Author: ThomasV <thomasv1@gmx.de>
       Date:   Tue,  5 Nov 2013 13:43:34 -0800
       
       Merge pull request #367 from rdymac/split-colon
       
       Split colon - separate - Clean wikia translation page
       Diffstat:
         M gui/qt/network_dialog.py            |       2 +-
         M gui/qt/transaction_dialog.py        |       6 +++---
       
       2 files changed, 4 insertions(+), 4 deletions(-)
       ---
   DIR diff --git a/gui/qt/network_dialog.py b/gui/qt/network_dialog.py
       t@@ -50,7 +50,7 @@ class NetworkDialog(QDialog):
                        status = _("Not connected")
        
                    if network.is_connected():
       -                status += "\n" + _("Server:") + " %s"%(network.interface.host) 
       +                status += "\n" + _("Server") + ": %s"%(network.interface.host) 
                    else:
                        status += "\n" + _("Disconnected from server")
                        
   DIR diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py
       t@@ -154,10 +154,10 @@ class TxDialog(QDialog):
                    if is_mine:
                        if fee is not None: 
                            self.amount_label.setText(_("Amount sent:")+' %s'% self.parent.format_amount(v-fee) + ' ' + self.parent.base_unit())
       -                    self.fee_label.setText(_("Transaction fee:")+' %s'% self.parent.format_amount(fee) + ' ' + self.parent.base_unit())
       +                    self.fee_label.setText(_("Transaction fee")+': %s'% self.parent.format_amount(fee) + ' ' + self.parent.base_unit())
                        else:
                            self.amount_label.setText(_("Amount sent:")+' %s'% self.parent.format_amount(v) + ' ' + self.parent.base_unit())
       -                    self.fee_label.setText(_("Transaction fee: unknown"))
       +                    self.fee_label.setText(_("Transaction fee")+': ' _("unknown"))
                    else:
                        self.amount_label.setText(_("Amount received:")+' %s'% self.parent.format_amount(v) + ' ' + self.parent.base_unit())
                else:
       t@@ -198,7 +198,7 @@ class TxDialog(QDialog):
            def broadcast(self):
                result, result_message = self.wallet.sendtx( self.tx )
                if result:
       -            self.show_message(_("Transaction successfully sent:")+' %s' % (result_message))
       +            self.show_message(_("Transaction successfully sent")+': %s' % (result_message))
                    if dialog:
                        dialog.done(0)
                else: