more corrections

zjohnson13 · Mar 28, 2018 · 39cd7b3 · 39cd7b3
1 parent 4be4af0
commit 39cd7b3
Show file tree

Hide file tree

Showing 40 changed files with 73 additions and 2,426 deletions.
diff --git a/src/atheneum-cli-res.rc b/src/atheneum-cli-res.rc
@@ -17,23 +17,23 @@ BEGIN
         BLOCK "040904E4" // U.S. English - multilingual (hex)
         BEGIN
             VALUE "CompanyName",        "Atheneum"
-<<<<<<< HEAD:src/phored-res.rc
+
             VALUE "FileDescription",    "atheneumd (OSS daemon/client for Atheneum)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
             VALUE "InternalName",       "atheneumd"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
             VALUE "OriginalFilename",   "atheneumd.exe"
             VALUE "ProductName",        "atheneumd"
-=======
+
             VALUE "FileDescription",    "Atheneum-cli (OSS RPC client for Atheneum)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
             VALUE "InternalName",       "atheneum-cli"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
             VALUE "OriginalFilename",   "atheneum-cli.exe"
             VALUE "ProductName",        "Atheneum-cli"
->>>>>>> 466fbe2a1ab9ce0d84b39e8c436704f862665715:src/atheneum-cli-res.rc
+atheneum-cli-res.rc
             VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
         END
     END

diff --git a/src/atheneum-cli.cpp b/src/atheneum-cli.cpp
@@ -3,11 +3,7 @@
 // Copyright (c) 2009-2015 The Dash developers
 // Copyright (c) 2015-2017 The PIVX developers
 // Copyright (c) 2017 The Phore developers
-<<<<<<< HEAD:src/phore-cli.cpp
-// Copyright (c) 2018 The Atheneum developers
-=======
 // Copyright (c) 2018 The Atheneum Developers
->>>>>>> 466fbe2a1ab9ce0d84b39e8c436704f862665715:src/atheneum-cli.cpp
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp
@@ -1,11 +1,7 @@
 // Copyright (c) 2014-2015 The Dash developers
 // Copyright (c) 2015-2017 The PIVX developers
 // Copyright (c) 2017 The Phore developers
-<<<<<<< HEAD
-// Copyright (c) 2018 The Atheneum developers
-=======
 // Copyright (c) 2018 The Atheneum Developers
->>>>>>> 466fbe2a1ab9ce0d84b39e8c436704f862665715
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/qt/atheneum.qrc b/src/qt/atheneum.qrc
@@ -39,11 +39,7 @@
         <file alias="tx_output">res/icons/tx_output.png</file>
         <file alias="tx_inout">res/icons/tx_inout.png</file>
         <file alias="unit_atheneum">res/icons/unit_atheneum.png</file>
-<<<<<<< HEAD:src/qt/phore.qrc
-        <file alias="unit_mpatheneum">res/icons/unit_matheneum.png</file>
-=======
         <file alias="unit_matheneum">res/icons/unit_matheneum.png</file>
->>>>>>> 466fbe2a1ab9ce0d84b39e8c436704f862665715:src/qt/atheneum.qrc
         <file alias="unit_uatheneum">res/icons/unit_uatheneum.png</file>
         <file alias="unit_tatheneum">res/icons/unit_tatheneum.png</file>
         <file alias="unit_tmatheneum">res/icons/unit_tmatheneum.png</file>

diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
@@ -41,19 +41,11 @@ bool BitcoinUnits::valid(int unit)
 QString BitcoinUnits::id(int unit)
 {
     switch (unit) {
-<<<<<<< HEAD
-    case PHR:
-        return QString("atheneum");
-    case mPHR:
-        return QString("matheneum");
-    case uPHR:
-=======
     case AEM:
         return QString("atheneum");
     case mAEM:
         return QString("matheneum");
     case uAEM:
->>>>>>> 466fbe2a1ab9ce0d84b39e8c436704f862665715
         return QString::fromUtf8("uatheneum");
     default:
         return QString("???");

diff --git a/src/qt/forms/bip38tooldialog.ui b/src/qt/forms/bip38tooldialog.ui
@@ -30,11 +30,7 @@
        <item>
         <widget class="QLabel" name="infoLabel_ENC">
          <property name="text">
-<<<<<<< HEAD
-          <string>Enter an Atheneum Address that you would like to encrypt using BIP 38. Enter a passphrase in the middle box. Press encrypt to compute the encrypted private key.</string>
-=======
           <string>Enter a Atheneum Address that you would like to encrypt using BIP 38. Enter a passphrase in the middle box. Press encrypt to compute the encrypted private key.</string>
->>>>>>> 466fbe2a1ab9ce0d84b39e8c436704f862665715
          </property>
          <property name="textFormat">
           <enum>Qt::PlainText</enum>

diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
@@ -185,11 +185,8 @@ bool Intro::pickDataDirectory()
     }
     /* Only override -datadir if different from the default, to make it possible to
      * override -datadir in the atheneum.conf file in the default data directory
-<<<<<<< HEAD
-     * (to be consistent with atheneumd behavior)
-=======
      * (to be consistent with phored behavior)
->>>>>>> 466fbe2a1ab9ce0d84b39e8c436704f862665715
+
      */
     if (dataDir != getDefaultDataDirectory())
         SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting

diff --git a/src/qt/locale/atheneum_ca.ts b/src/qt/locale/atheneum_ca.ts
@@ -62,12 +62,12 @@
         <translation>Adreces de recepció</translation>
     </message>
     <message>
-        <source>These are your Phore addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Aquestes són les teves adreces Phore per fer enviar pagaments. Sempre comprova l'import i l'adreça de recepció abans d'enviar les monedes.</translation>
+        <source>These are your Atheneum addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>Aquestes són les teves adreces Atheneum per fer enviar pagaments. Sempre comprova l'import i l'adreça de recepció abans d'enviar les monedes.</translation>
     </message>
     <message>
-        <source>These are your Phore addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Aquestes són les teves adreces Phore per rebre pagaments. Es recomana utilitzar noves adreces de recepció per cada transacció.</translation>
+        <source>These are your Atheneum addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>Aquestes són les teves adreces Atheneum per rebre pagaments. Es recomana utilitzar noves adreces de recepció per cada transacció.</translation>
     </message>
     <message>
         <source>&amp;Copy Address</source>
@@ -168,16 +168,16 @@
         <translation>Confirma l'encriptació del moneder</translation>
     </message>
     <message>
-        <source>Phore will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PHRs from being stolen by malware infecting your computer.</source>
-        <translation>Phore es tancarà per finalitzar el procés d'encriptació. Recorda que encriptant el teu moneder no protegeix els teus PHR de ser robats si el teu ordinador està infectat amb programari maliciós.</translation>
+        <source>Atheneum will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your AEMs from being stolen by malware infecting your computer.</source>
+        <translation>Atheneum es tancarà per finalitzar el procés d'encriptació. Recorda que encriptant el teu moneder no protegeix els teus AEM de ser robats si el teu ordinador està infectat amb programari maliciós.</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
         <translation>Estàs segur que vols encriptar el moneder?</translation>
     </message>
     <message>
-        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR PHR&lt;/b&gt;!</source>
-        <translation>Avís: Si encripteu el vostre moneder i perdeu la contrasenya, &lt;b&gt;PERDREU TOTS ELS VOSTRES PHRS&lt;/b&gt;!</translation>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR AEM&lt;/b&gt;!</source>
+        <translation>Avís: Si encripteu el vostre moneder i perdeu la contrasenya, &lt;b&gt;PERDREU TOTS ELS VOSTRES AEMS&lt;/b&gt;!</translation>
     </message>
     <message>
         <source>Wallet encrypted</source>
@@ -418,12 +418,12 @@
         <translation>A&amp;juda</translation>
     </message>
     <message>
-        <source>Phore Core</source>
-        <translation>Phore Core</translation>
+        <source>Atheneum Core</source>
+        <translation>Atheneum Core</translation>
     </message>
     <message>
-        <source>Send coins to a Phore address</source>
-        <translation>Envia monedes a una adreça Phore</translation>
+        <source>Send coins to a Atheneum address</source>
+        <translation>Envia monedes a una adreça Atheneum</translation>
     </message>
     <message>
         <source>&amp;Privacy</source>
@@ -434,8 +434,8 @@
         <translation>&amp;Masternodes</translation>
     </message>
     <message>
-        <source>&amp;About Phore Core</source>
-        <translation>&amp;Sobre Phore Core</translation>
+        <source>&amp;About Atheneum Core</source>
+        <translation>&amp;Sobre Atheneum Core</translation>
     </message>
     <message>
         <source>&amp;BIP38 tool</source>
@@ -458,12 +458,12 @@
         <translation>Obre el fitxer de configuració del Masternode</translation>
     </message>
     <message>
-        <source>Phore Core client</source>
-        <translation>Client Phore core</translation>
+        <source>Atheneum Core client</source>
+        <translation>Client Atheneum core</translation>
     </message>
     <message numerus="yes">
-        <source>%n active connection(s) to Phore network</source>
-        <translation><numerusform>%n connexió activa a la xarxa Phore</numerusform><numerusform>%n connexions actives a la xarxa Phore</numerusform></translation>
+        <source>%n active connection(s) to Atheneum network</source>
+        <translation><numerusform>%n connexió activa a la xarxa Atheneum</numerusform><numerusform>%n connexions actives a la xarxa Atheneum</numerusform></translation>
     </message>
     <message>
         <source>Synchronizing with network...</source>
@@ -814,8 +814,8 @@
         <translation>Edita l'adreça d'enviament</translation>
     </message>
     <message>
-        <source>The entered address "%1" is not a valid Phore address.</source>
-        <translation>L'adreça introduïda "%1" no és una adreça Phore vàlida.</translation>
+        <source>The entered address "%1" is not a valid Atheneum address.</source>
+        <translation>L'adreça introduïda "%1" no és una adreça Atheneum vàlida.</translation>
     </message>
     <message>
         <source>The entered address "%1" is already in the address book.</source>
@@ -860,16 +860,16 @@
         <translation>versió</translation>
     </message>
     <message>
-        <source>Phore Core</source>
-        <translation>Phore Core</translation>
+        <source>Atheneum Core</source>
+        <translation>Atheneum Core</translation>
     </message>
     <message>
         <source>(%1-bit)</source>
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Phore Core</source>
-        <translation>Sobre Phore Core</translation>
+        <source>About Atheneum Core</source>
+        <translation>Sobre Atheneum Core</translation>
     </message>
     <message>
         <source>Command-line options</source>
@@ -915,12 +915,12 @@
         <translation>Benvingut</translation>
     </message>
     <message>
-        <source>Welcome to Phore Core.</source>
-        <translation>Benvingut a Phore Core.</translation>
+        <source>Welcome to Atheneum Core.</source>
+        <translation>Benvingut a Atheneum Core.</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Phore Core will store its data.</source>
-        <translation>Al ser el primer cop que s'inicia el programa, pots escollir on es desaran les dades del Phore Core.</translation>
+        <source>As this is the first time the program is launched, you can choose where Atheneum Core will store its data.</source>
+        <translation>Al ser el primer cop que s'inicia el programa, pots escollir on es desaran les dades del Atheneum Core.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -931,8 +931,8 @@
         <translation>Usar una carpeta de dades personalitzada:</translation>
     </message>
     <message>
-        <source>Phore Core</source>
-        <translation>Phore Core</translation>
+        <source>Atheneum Core</source>
+        <translation>Atheneum Core</translation>
     </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
@@ -1142,24 +1142,24 @@
         <translation>Si us plau, selecciona un nivell de privacitat.</translation>
     </message>
     <message>
-        <source>Use 2 separate masternodes to mix funds up to 10000 PHR</source>
-        <translation>Utilitza 2 masternodes diferents per mesclar fons de fins a 10000 PHR</translation>
+        <source>Use 2 separate masternodes to mix funds up to 10000 AEM</source>
+        <translation>Utilitza 2 masternodes diferents per mesclar fons de fins a 10000 AEM</translation>
     </message>
     <message>
-        <source>Use 8 separate masternodes to mix funds up to 10000 PHR</source>
-        <translation>Utilitza 8 masternodes diferents per mesclar fons de fins a 10000 PHR</translation>
+        <source>Use 8 separate masternodes to mix funds up to 10000 AEM</source>
+        <translation>Utilitza 8 masternodes diferents per mesclar fons de fins a 10000 AEM</translation>
     </message>
     <message>
         <source>Use 16 separate masternodes</source>
         <translation>Utilitza 16 masternodes diferents</translation>
     </message>
     <message>
-        <source>This option is the quickest and will cost about ~0.025 PHR to anonymize 10000 PHR</source>
-        <translation>Aquesta opció és la més ràpida i té un cost d'uns ~0.025 PHR per anonimitzar 10000 PHR</translation>
+        <source>This option is the quickest and will cost about ~0.025 AEM to anonymize 10000 AEM</source>
+        <translation>Aquesta opció és la més ràpida i té un cost d'uns ~0.025 AEM per anonimitzar 10000 AEM</translation>
     </message>
     <message>
-        <source>This option is moderately fast and will cost about 0.05 PHR to anonymize 10000 PHR</source>
-        <translation>Aquesta opció és moderadament ràpida i té un cost d'uns 0.05 PHR per anonimitzar 10000 PHR</translation>
+        <source>This option is moderately fast and will cost about 0.05 AEM to anonymize 10000 AEM</source>
+        <translation>Aquesta opció és moderadament ràpida i té un cost d'uns 0.05 AEM per anonimitzar 10000 AEM</translation>
     </message>
     <message>
         <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
@@ -1208,8 +1208,8 @@
         <translation>Expert</translation>
     </message>
     <message>
-        <source>Automatically start Phore after logging in to the system.</source>
-        <translation>Inicia Phore automàticament després d'identificar-te en el sistema.</translation>
+        <source>Automatically start Atheneum after logging in to the system.</source>
+        <translation>Inicia Atheneum automàticament després d'identificar-te en el sistema.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1271,12 +1271,12 @@
         <translation>Total:</translation>
     </message>
     <message>
-        <source>PHR:</source>
-        <translation>PHR:</translation>
+        <source>AEM:</source>
+        <translation>AEM:</translation>
     </message>
     <message>
-        <source>zPHR:</source>
-        <translation>zPHR:</translation>
+        <source>zAEM:</source>
+        <translation>zAEM:</translation>
     </message>
     <message>
         <source>0 %</source>
@@ -1304,20 +1304,20 @@
 <context>
     <name>PrivacyDialog</name>
     <message>
-        <source>Zerocoin PHR (zPHR)</source>
-        <translation>Zerocoin PHR (zPHR)</translation>
+        <source>Zerocoin AEM (zAEM)</source>
+        <translation>Zerocoin AEM (zAEM)</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>zPHR</source>
-        <translation>zPHR</translation>
+        <source>zAEM</source>
+        <translation>zAEM</translation>
     </message>
     <message>
-        <source>0.000 000 00 PHR</source>
-        <translation>0.000 000 00 PHR</translation>
+        <source>0.000 000 00 AEM</source>
+        <translation>0.000 000 00 AEM</translation>
     </message>
     <message>
         <source>Reset</source>
@@ -1332,8 +1332,8 @@
         <translation>Import:</translation>
     </message>
     <message>
-        <source>0 zPHR</source>
-        <translation>0 zPHR</translation>
+        <source>0 zAEM</source>
+        <translation>0 zAEM</translation>
     </message>
     <message>
         <source>Alt+A</source>
@@ -1719,8 +1719,8 @@
 <context>
     <name>ShutdownWindow</name>
     <message>
-        <source>Phore Core is shutting down...</source>
-        <translation>Phore Core s'està tancant...</translation>
+        <source>Atheneum Core is shutting down...</source>
+        <translation>Atheneum Core s'està tancant...</translation>
     </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
@@ -1785,8 +1785,8 @@
 <context>
     <name>SplashScreen</name>
     <message>
-        <source>Phore Core</source>
-        <translation>Phore Core</translation>
+        <source>Atheneum Core</source>
+        <translation>Atheneum Core</translation>
     </message>
     <message>
         <source>Version %1</source>
@@ -1969,7 +1969,7 @@
     </message>
     </context>
 <context>
-    <name>ZPhrControlDialog</name>
+    <name>ZAEMControlDialog</name>
     <message>
         <source>Quantity</source>
         <translation>Quantitat</translation>
@@ -1979,12 +1979,12 @@
         <translation>0</translation>
     </message>
     <message>
-        <source>zPhr</source>
-        <translation>zPhr</translation>
+        <source>zAEM</source>
+        <translation>zAEM</translation>
     </message>
     </context>
 <context>
-    <name>phore-core</name>
+    <name>atheneum-core</name>
     <message>
         <source>Can't mix while sync in progress.</source>
         <translation>No es pot mesclar mentre s'està sincronitzant.</translation>