Merge branch 'develop'

README.rst

@@ -68,6 +68,10 @@ Compile the icons file for Qt::
     sudo apt-get install pyqt5-dev-tools
     pyrcc5 icons.qrc -o gui/qt/icons_rc.py
 
+For the linux app launcher (start menu) icon::
+
+    sudo desktop-file-install electrum.desktop
+
 Compile the protobuf description file::
 
     sudo apt-get install protobuf-compiler

electrum.desktop

@@ -2,13 +2,13 @@
 # sudo desktop-file-install electrum.desktop
 
 [Desktop Entry]
-Comment=Lightweight Bitcoin Client
+Comment=Lightweight Zclassic Client
 Exec=electrum %u
-GenericName[en_US]=Bitcoin Wallet
-GenericName=Bitcoin Wallet
+GenericName[en_US]=Zclassic Wallet
+GenericName=Zclassic Wallet
 Icon=electrum
-Name[en_US]=Electrum Bitcoin Wallet
-Name=Electrum Bitcoin Wallet
+Name[en_US]=Zclassic Electrum Wallet
+Name=Zclassic Electrum Wallet
 Categories=Finance;Network;
 StartupNotify=false
 Terminal=false

gui/qt/main_window.py

@@ -363,7 +363,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
             self.setGeometry(100, 100, 840, 400)
 
     def watching_only_changed(self):
-        name = "Electrum Testnet" if NetworkConstants.TESTNET else "Electrum"
+        name = "[TESTNET] Zclassic Electrum" if NetworkConstants.TESTNET else "Zclassic Electrum"
         title = '%s %s  -  %s' % (name, self.wallet.electrum_version,
                                         self.wallet.basename())
         extra = [self.wallet.storage.get('wallet_type', '?')]

lib/servers.json

@@ -1,4 +1,4 @@
 {
-    "zcl-electrum.com": {"s":"50002"}
+    "zcl-electrum.com": {"s":"50003"}
 }