up

Toklio-project · Jul 31, 2019 · 4233bcd · 4233bcd
1 parent 69847b8
commit 4233bcd
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 37 deletions.
diff --git a/images/merchant/bg.png b/images/merchant/bg.png
diff --git a/images/themes/white/titlebarLogo.png b/images/themes/white/titlebarLogo.png
diff --git a/images/themes/white/titlebarLogo@2x.png b/images/themes/white/titlebarLogo@2x.png
diff --git a/installers/windows/ReadMe.htm b/installers/windows/ReadMe.htm
@@ -57,7 +57,7 @@ <h2>Access to the Blockchain</h2>
   i.e. let it download the blockchain and store it locally on your computer, or you can configure your wallet to
   access a remote <i>open node</i> to get indirect access to the blockchain.</p>
 
-  <p>Working with your own copy of the blockchain is <b>preferred</b>: It strengthens the Monero network, and it
+  <p>Working with your own copy of the blockchain is <b>preferred</b>: It strengthens the Toklio network, and it
   provides the most security and privacy possible for you.</p>
 
   <p>However if your Internet access makes it difficult to run a full node, or if you have simply no room to store
@@ -78,7 +78,7 @@ <h2>Initial Blockchain Download</h2>
   <p>Depending on your Internet access, the speed of your computer and the type of disk you use (HDD or SSD) this can take
   <b>several hours</b>, in some cases <b>more than a day</b>. Furthermore there are unfortunate cases where the
   download gets stuck somehow or doesn't work at all, e.g. because a firewall prevents access to other nodes of the
-  Monero network.</p>
+  Toklio network.</p>
 
   <p>The GUI wallet can start the daemon for you. You can also use the <i>Monero Daemon</i> icon in the <i>Utilities</i>
   sub-folder of the Monero program group.</p>

diff --git a/installers/windows/toklio-daemon.bat b/installers/windows/toklio-daemon.bat
@@ -1,3 +1,3 @@
-REM Execute the Monero daemon and then stay with window open after it exits
+REM Execute the Toklio daemon and then stay with window open after it exits
 "C:\Program Files\Toklio Core\tokliod.exe"
 PAUSE
diff --git a/js/TxUtils.js b/js/TxUtils.js
@@ -75,7 +75,7 @@ function isValidOpenAliasAddress(address) {
 }
 
 function makeQRCodeString(addr, amount) {
-    var XMR_URI_SCHEME = "monero:"
+    var XMR_URI_SCHEME = "Toklio:"
     var XMR_AMOUNT = "tx_amount"
     var qrCodeString =""
     qrCodeString += (XMR_URI_SCHEME + addr)

diff --git a/main.qml b/main.qml
@@ -92,16 +92,16 @@ ApplicationWindow {
     property var fiatPriceAPIs: {
         return {
             "kraken": {
-                "xmrusd": "https://api.kraken.com/0/public/Ticker?pair=XMRUSD",
-                "xmreur": "https://api.kraken.com/0/public/Ticker?pair=XMREUR"
+                "xmrusd": "https://api.kraken.com/0/public/Ticker?pair=TOKLUSD",
+                "xmreur": "https://api.kraken.com/0/public/Ticker?pair=TOKLEUR"
             },
             "coingecko": {
                 "xmrusd": "https://api.coingecko.com/api/v3/simple/price?ids=monero&vs_currencies=usd",
                 "xmreur": "https://api.coingecko.com/api/v3/simple/price?ids=monero&vs_currencies=eur"
             },
             "cryptocompare": {
-                "xmrusd": "https://min-api.cryptocompare.com/data/price?fsym=XMR&tsyms=USD",
-                "xmreur": "https://min-api.cryptocompare.com/data/price?fsym=XMR&tsyms=EUR",
+                "xmrusd": "https://min-api.cryptocompare.com/data/price?fsym=TOKL&tsyms=USD",
+                "xmreur": "https://min-api.cryptocompare.com/data/price?fsym=TOKL&tsyms=EUR",
             }
         }
     }
@@ -427,8 +427,8 @@ ApplicationWindow {
     }
 
     function onUriHandler(uri){
-        if(uri.startsWith("monero://")){
-            var address = uri.substring("monero://".length);
+        if(uri.startsWith("Toklio://")){
+            var address = uri.substring("Toklio://".length);
 
             var params = {}
             if(address.length === 0) return;

diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
@@ -102,7 +102,7 @@ Rectangle {
                 textMargin: 0
                 leftPadding: 0
                 topPadding: 0
-                text: qsTr("This makes it easier to send or receive Monero and reduces errors when typing in addresses manually.") + translationManager.emptyString
+                text: qsTr("This makes it easier to send or receive Toklio and reduces errors when typing in addresses manually.") + translationManager.emptyString
                 width: parent.width
                 readOnly: true
 

diff --git a/pages/History.qml b/pages/History.qml
@@ -654,7 +654,7 @@ Rectangle {
                                 MoneroComponents.TextPlain {
                                     font.family: MoneroComponents.Style.fontRegular.name
                                     font.pixelSize: 15
-                                    text: _amount + " XMR"
+                                    text: _amount + " TOKL"
                                     color: MoneroComponents.Style.defaultFontColor
                                     anchors.verticalCenter: parent.verticalCenter
 
@@ -706,7 +706,7 @@ Rectangle {
                                     font.pixelSize: 15
                                     text: {
                                         if(!isout && confirmationsRequired === 60) return qsTr("Yes") + translationManager.emptyString;
-                                        if(fee !== "") return fee + " XMR";
+                                        if(fee !== "") return fee + " TOKL";
                                         return "-";
                                     }
 

diff --git a/pages/Mining.qml b/pages/Mining.qml
@@ -68,7 +68,7 @@ Rectangle {
 
         MoneroComponents.TextPlain {
             id: soloMainLabel
-            text: qsTr("Mining with your computer helps strengthen the Monero network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.\n\nMining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck!") + translationManager.emptyString
+            text: qsTr("Mining with your computer helps strengthen the Toklio network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.\n\nMining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck!") + translationManager.emptyString
             wrapMode: Text.Wrap
             Layout.fillWidth: true
             font.family: MoneroComponents.Style.fontRegular.name

diff --git a/pages/merchant/Merchant.qml b/pages/merchant/Merchant.qml
@@ -452,7 +452,7 @@ Item {
                         font.pixelSize: 14
                         font.bold: false
                         color: "white"
-                        text: qsTr("Amount to receive") + " (XMR)"
+                        text: qsTr("Amount to receive") + " (TOKL)"
                         themeTransition: false
                     }
 
@@ -500,7 +500,7 @@ Item {
                     }
 
                     MoneroComponents.TextPlain {
-                        // @TODO: When we have XMR/USD rate avi. in the future.
+                        // @TODO: When we have TOKL/USD rate avi. in the future.
                         visible: false
                         font.pixelSize: 14
                         font.bold: false

diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml
@@ -97,7 +97,7 @@ Rectangle {
             MoneroComponents.TextBlock {
                 id: guiMoneroVersion
                 font.pixelSize: 14
-                text: qsTr("Embedded Monero version: ") + translationManager.emptyString
+                text: qsTr("Embedded Toklio version: ") + translationManager.emptyString
             }
 
             MoneroComponents.TextBlock {
@@ -370,7 +370,7 @@ Rectangle {
             onClicked: {
                 var data = "";
                 data += "GUI version: " + Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")";
-                data += "\nEmbedded Monero version: " + Version.GUI_MONERO_VERSION;
+                data += "\nEmbedded Toklio version: " + Version.GUI_MONERO_VERSION;
                 data += "\nWallet path: ";
 
                 var wallet_path = walletPath();

diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml
@@ -244,7 +244,7 @@ Rectangle{
                     textMargin: 0
                     leftPadding: 0
                     topPadding: 0
-                    text: qsTr("Uses a third-party server to connect to the Monero network. Less secure, but easier on your computer.") + translationManager.emptyString
+                    text: qsTr("Uses a third-party server to connect to the Toklio network. Less secure, but easier on your computer.") + translationManager.emptyString
                     width: parent.width - (remoteNodeIcon.width + remoteNodeIcon.anchors.leftMargin + anchors.leftMargin)
                     readOnly: true
 
@@ -290,7 +290,7 @@ Rectangle{
             MoneroComponents.WarningBox {
                 Layout.topMargin: 26
                 Layout.bottomMargin: 6
-                text: qsTr("To find a remote node, type 'Monero remote node' into your favorite search engine. Please ensure the node is run by a trusted third-party.") + translationManager.emptyString
+                text: qsTr("To find a remote node, type 'Toklio remote node' into your favorite search engine. Please ensure the node is run by a trusted third-party.") + translationManager.emptyString
             }
 
             MoneroComponents.RemoteNodeEdit {

diff --git a/src/qt/MoneroSettings.cpp b/src/qt/MoneroSettings.cpp
@@ -44,7 +44,7 @@
 
 /*!
     \qmlmodule moneroSettings 1.0
-    \title Monero Settings QML Component
+    \title Toklio Settings QML Component
     \ingroup qmlmodules
     \brief Provides persistent platform-independent application settings.
 

diff --git a/src/qt/TailsOS.cpp b/src/qt/TailsOS.cpp
@@ -43,9 +43,9 @@ void TailsOS::showDataPersistenceDisabledWarning()
     msgBox.setText(QObject::tr("Warning: persistence disabled"));
     msgBox.setWindowTitle(QObject::tr("Warning: persistence disabled"));
     msgBox.setInformativeText(
-        QObject::tr("Monero GUI has detected that Tails persistence is "
+        QObject::tr("Toklio GUI has detected that Tails persistence is "
                      "currently disabled. Any configurations you make inside "
-                     "the Monero GUI will not be saved."
+                     "the Toklio GUI will not be saved."
                      "\n\n"
                      "In addition, make sure to not save your wallet on the "
                      "filesystem, as it will be lost at shutdown."
@@ -63,7 +63,7 @@ void TailsOS::showDataPersistenceDisabledWarning()
 void TailsOS::askPersistence()
 {
     QMessageBox msgBox;
-    msgBox.setWindowTitle(QObject::tr("Monero GUI"));
+    msgBox.setWindowTitle(QObject::tr("Toklio GUI"));
     msgBox.setText(QObject::tr("Use Tails persistence?"));
     msgBox.setInformativeText(
         QObject::tr("Persist wallet files and configuration on the encrypted volume?"

diff --git a/src/qt/utils.cpp b/src/qt/utils.cpp
@@ -70,17 +70,17 @@ QString getAccountName(){
 QString xdgMime(QApplication &app){
     return QString(
         "[Desktop Entry]\n"
-        "Name=Monero GUI\n"
-        "GenericName=Monero-GUI\n"
-        "X-GNOME-FullName=Monero-GUI\n"
-        "Comment=Monero GUI\n"
-        "Keywords=Monero;\n"
+        "Name=Toklio GUI\n"
+        "GenericName=Toklio-GUI\n"
+        "X-GNOME-FullName=Toklio-GUI\n"
+        "Comment=Toklio GUI\n"
+        "Keywords=Toklio;\n"
         "Exec=%1 %u\n"
         "Terminal=false\n"
         "Type=Application\n"
         "Icon=toklio\n"
         "Categories=Network;GNOME;Qt;\n"
-        "MimeType=x-scheme-handler/toklio;x-scheme-handler/moneroseed\n"
+        "MimeType=x-scheme-handler/toklio;x-scheme-handler/toklioseed\n"
         "StartupNotify=true\n"
         "X-GNOME-Bugzilla-Bugzilla=GNOME\n"
         "X-GNOME-UsesNotifications=true\n"

diff --git a/wizard/WizardCreateWallet3.qml b/wizard/WizardCreateWallet3.qml
@@ -55,7 +55,7 @@ Rectangle {
 
             WizardHeader {
                 title: qsTr("Daemon settings") + translationManager.emptyString
-                subtitle: qsTr("To be able to communicate with the Monero network your wallet needs to be connected to a Monero node. For best privacy it's recommended to run your own node.") + translationManager.emptyString
+                subtitle: qsTr("To be able to communicate with the Toklio network your wallet needs to be connected to a Toklio node. For best privacy it's recommended to run your own node.") + translationManager.emptyString
             }
 
             WizardDaemonSettings {

diff --git a/wizard/WizardDaemonSettings.qml b/wizard/WizardDaemonSettings.qml
@@ -118,7 +118,7 @@ ColumnLayout {
             }
 
             TextArea {
-                text: qsTr("Additionally, you may specify a bootstrap node to use Monero immediately.") + translationManager.emptyString
+                text: qsTr("Additionally, you may specify a bootstrap node to use Toklio immediately.") + translationManager.emptyString
                 Layout.topMargin: 4
                 Layout.fillWidth: true
 

diff --git a/wizard/WizardHome.qml b/wizard/WizardHome.qml
@@ -84,7 +84,7 @@ Rectangle {
 
             WizardMenuItem {
                 headerText: qsTr("Create a new wallet from hardware") + translationManager.emptyString
-                bodyText: qsTr("Connect your hardware wallet to create a new Monero wallet.") + translationManager.emptyString
+                bodyText: qsTr("Connect your hardware wallet to create a new Toklio wallet.") + translationManager.emptyString
                 imageIcon: "qrc:///images/restore-wallet-from-hardware.png"
 
                 onMenuClicked: {

diff --git a/wizard/WizardLang.qml b/wizard/WizardLang.qml
@@ -99,7 +99,7 @@ Rectangle {
             visible: parent.subtitle !== ""
 
             color: MoneroComponents.Style.dimmedFontColor
-            text: qsTr("Change the language of the Monero GUI.") + translationManager.emptyString
+            text: qsTr("Change the language of the Toklio GUI.") + translationManager.emptyString
 
             font.family: MoneroComponents.Style.fontRegular.name
             font.pixelSize: {

diff --git a/wizard/WizardModeBootstrap.qml b/wizard/WizardModeBootstrap.qml
@@ -79,7 +79,7 @@ Rectangle {
                 }
 
                 MoneroComponents.TextPlain {
-                    text: qsTr("Temporary use of remote nodes is useful in order to use Monero immediately (hence the name <i>bootstrap</i>), however be aware that when using remote nodes (including with the bootstrap setting), nodes could track your IP address, track your \"restore height\" and associated block request data, and send you inaccurate information to learn more about transactions you make.") + translationManager.emptyString
+                    text: qsTr("Temporary use of remote nodes is useful in order to use Toklio immediately (hence the name <i>bootstrap</i>), however be aware that when using remote nodes (including with the bootstrap setting), nodes could track your IP address, track your \"restore height\" and associated block request data, and send you inaccurate information to learn more about transactions you make.") + translationManager.emptyString
                     wrapMode: Text.Wrap
                     Layout.topMargin: 8
                     Layout.fillWidth: true

diff --git a/wizard/WizardModeRemoteNodeWarning.qml b/wizard/WizardModeRemoteNodeWarning.qml
@@ -67,7 +67,7 @@ Rectangle {
                 Layout.fillWidth: true
 
                 MoneroComponents.TextPlain {
-                    text: qsTr("This mode is ideal for managing small amounts of Monero. You have access to basic features for making and managing transactions. It will automatically connect to the Monero network so you can start using Monero immediately.") + translationManager.emptyString
+                    text: qsTr("This mode is ideal for managing small amounts of Monero. You have access to basic features for making and managing transactions. It will automatically connect to the Toklio network so you can start using Toklio immediately.") + translationManager.emptyString
                     themeTransitionBlackColor: MoneroComponents.Style._b_lightGreyFontColor
                     themeTransitionWhiteColor: MoneroComponents.Style._w_lightGreyFontColor
                     wrapMode: Text.Wrap

diff --git a/wizard/WizardRestoreWallet3.qml b/wizard/WizardRestoreWallet3.qml
@@ -63,7 +63,7 @@ Rectangle {
 
             WizardHeader {
                 title: qsTr("Daemon settings") + translationManager.emptyString
-                subtitle: qsTr("To be able to communicate with the Monero network your wallet needs to be connected to a Monero node. For best privacy it's recommended to run your own node.\n\nIf you don't have the option to run your own node, there's an option to connect to a remote node.") + translationManager.emptyString
+                subtitle: qsTr("To be able to communicate with the Toklio network your wallet needs to be connected to a Toklio node. For best privacy it's recommended to run your own node.\n\nIf you don't have the option to run your own node, there's an option to connect to a remote node.") + translationManager.emptyString
             }
 
             WizardDaemonSettings {