Revert "Increment version"

This reverts commit 5595d23.
KomodoPlatform · Feb 23, 2024 · 66566ee · 66566ee
1 parent 5595d23
commit 66566ee
Show file tree

Hide file tree

Showing 13 changed files with 172 additions and 268 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,7 +26,7 @@ Please describe what you expected to happen.
 **Operating Environment(s):**
  - OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ]
  - OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ]
- - Komodo Wallet Version: [e.g. 0.7.2]
+ - Komodo Wallet Version: [e.g. 0.7.1]
  - Build branch: [e.g. master/dev] 
 
 

diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml
@@ -9,7 +9,7 @@ env:
   DEX_PROJECT_NAME: "komodo-wallet"
   DEX_DISPLAY_NAME: "Komodo Wallet"
   DEX_COMPANY: "KomodoPlatform"
-  DEX_VERSION: "0.7.2"
+  DEX_VERSION: "0.7.1"
   DEX_WEBSITE: "https://atomicdex.io/"
 
 jobs:

diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -16,7 +16,7 @@ env:
   DEX_PROJECT_NAME: "komodo-wallet"
   DEX_DISPLAY_NAME: "Komodo Wallet"
   DEX_COMPANY: "KomodoPlatform"
-  DEX_VERSION: "0.7.2"
+  DEX_VERSION: "0.7.1"
   DEX_WEBSITE: "https://atomicdex.io/"
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
   VCPKG_BINARY_SOURCES: clear;x-gha,readwrite

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
 include(qt_prerequisites)
 include(cfg_hash)
 
-project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.2)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.1)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)

diff --git a/atomic_defi_design/assets/languages/atomic_defi_de.ts b/atomic_defi_design/assets/languages/atomic_defi_de.ts
@@ -516,17 +516,17 @@ Beispiel: Kennwort = 1234    Suffix=56    Eingabe beim Login=123456</translation
 <context>
     <name>Chart</name>
     <message>
-        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="177"/>
-        <source>Loading pair chart data</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="170"/>
+        <source>Loading market data</source>
+        <translation>Laden von Marktdaten</translation>
     </message>
     <message>
-        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="183"/>
+        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="176"/>
         <source>There is no chart data for this pair</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="191"/>
+        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="184"/>
         <source>There is no chart data for %1 (testcoin) pairs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1956,6 +1956,11 @@ They will be removed from the orderbook until you log in again.</source>
         <source>Explore</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../Dex/Wallet/Main.qml" line="935"/>
+        <source>Loading market data</source>
+        <translation>Laden von Marktdaten</translation>
+    </message>
     <message>
         <location filename="../../Dex/Wallet/Main.qml" line="942"/>
         <source>There is no chart data for this ticker yet</source>
@@ -1976,11 +1981,6 @@ They will be removed from the orderbook until you log in again.</source>
         <source>Please wait, %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../Dex/Wallet/Main.qml" line="935"/>
-        <source>Loading ticker chart data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../Dex/Wallet/Main.qml" line="1003"/>
         <source>% activated...</source>
@@ -1992,18 +1992,18 @@ They will be removed from the orderbook until you log in again.</source>
         <translation>Handelsinformationen</translation>
     </message>
     <message>
-        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="36"/>
+        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="41"/>
         <source>Chart</source>
         <translation type="unfinished">Chart</translation>
     </message>
     <message>
-        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="44"/>
+        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="49"/>
         <location filename="../../Dex/Exchange/Trade/SimpleView/Main.qml" line="110"/>
         <source>Orders</source>
         <translation type="unfinished">Order</translation>
     </message>
     <message>
-        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="52"/>
+        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="57"/>
         <location filename="../../Dex/Exchange/Trade/SimpleView/Main.qml" line="120"/>
         <source>History</source>
         <translation>Historie</translation>
@@ -2025,7 +2025,7 @@ They will be removed from the orderbook until you log in again.</source>
     </message>
     <message>
         <location filename="../../Dex/Addressbook/Main.qml" line="62"/>
-        <location filename="../../Dex/Addressbook/Main.qml" line="343"/>
+        <location filename="../../Dex/Addressbook/Main.qml" line="336"/>
         <source>Address Book</source>
         <translation type="unfinished">Adressbuch</translation>
     </message>
@@ -2050,27 +2050,22 @@ They will be removed from the orderbook until you log in again.</source>
         <translation type="unfinished">Schlagworte</translation>
     </message>
     <message>
-        <location filename="../../Dex/Addressbook/Main.qml" line="127"/>
-        <source>No contacts found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Dex/Addressbook/Main.qml" line="246"/>
+        <location filename="../../Dex/Addressbook/Main.qml" line="239"/>
         <source>Edit</source>
         <translation type="unfinished">Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../../Dex/Addressbook/Main.qml" line="259"/>
+        <location filename="../../Dex/Addressbook/Main.qml" line="252"/>
         <source>Delete</source>
         <translation type="unfinished">Löschen</translation>
     </message>
     <message>
-        <location filename="../../Dex/Addressbook/Main.qml" line="343"/>
+        <location filename="../../Dex/Addressbook/Main.qml" line="336"/>
         <source>address copied to clipboard</source>
         <translation>Adresse in die Zwischenablage kopiert</translation>
     </message>
     <message>
-        <location filename="../../Dex/Addressbook/Main.qml" line="366"/>
+        <location filename="../../Dex/Addressbook/Main.qml" line="359"/>
         <source>This contact does not have any registered address.</source>
         <translation>Dieser Kontakt hat keine registrierte Adresse.</translation>
     </message>
@@ -3575,11 +3570,6 @@ Bitte wählen Sie eine neue Order aus.</translation>
         <source>copied to clipboard</source>
         <translation>In die Zwischenablage kopiert</translation>
     </message>
-    <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="801"/>
-        <source>Search for Update</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../Dex/Settings/SettingModal.qml" line="129"/>
         <source>About &amp; Version</source>
@@ -3653,17 +3643,6 @@ Bitte wählen Sie eine neue Order aus.</translation>
         <source>MM2 Version copied to clipboard.</source>
         <translation>MM2 Version in die Zwischenablage kopiert.</translation>
     </message>
-    <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="724"/>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="731"/>
-        <source>RPC Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="732"/>
-        <source>RPC Port copied to clipboard.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../Dex/Settings/SettingModal.qml" line="746"/>
         <location filename="../../Dex/Settings/SettingModal.qml" line="753"/>
@@ -3676,22 +3655,27 @@ Bitte wählen Sie eine neue Order aus.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="768"/>
+        <location filename="../../Dex/Settings/SettingModal.qml" line="724"/>
         <source>Qt version</source>
         <translation>Qt Version</translation>
     </message>
     <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="775"/>
+        <location filename="../../Dex/Settings/SettingModal.qml" line="731"/>
         <source>Qt Version</source>
         <translation>Qt Version</translation>
     </message>
     <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="776"/>
+        <location filename="../../Dex/Settings/SettingModal.qml" line="732"/>
         <source>Qt Version copied to clipboard.</source>
         <translation>Qt Version in die Zwischenablage kopiert.</translation>
     </message>
     <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="818"/>
+        <location filename="../../Dex/Settings/SettingModal.qml" line="780"/>
+        <source>Search Update</source>
+        <translation>Update suchen</translation>
+    </message>
+    <message>
+        <location filename="../../Dex/Settings/SettingModal.qml" line="797"/>
         <source>Logout</source>
         <translation>Abmelden</translation>
     </message>
@@ -4579,7 +4563,7 @@ This might take a few minutes...</source>
 <context>
     <name>atomic_dex::settings_page</name>
     <message>
-        <location filename="../../../src/core/atomicdex/pages/qt.settings.page.cpp" line="805"/>
+        <location filename="../../../src/core/atomicdex/pages/qt.settings.page.cpp" line="782"/>
         <source>An error has occurred.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/atomic_defi_design/assets/languages/atomic_defi_en.ts b/atomic_defi_design/assets/languages/atomic_defi_en.ts
@@ -515,17 +515,17 @@
 <context>
     <name>Chart</name>
     <message>
-        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="177"/>
-        <source>Loading pair chart data</source>
+        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="170"/>
+        <source>Loading market data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="183"/>
+        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="176"/>
         <source>There is no chart data for this pair</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="191"/>
+        <location filename="../../Dex/Exchange/ProView/Chart.qml" line="184"/>
         <source>There is no chart data for %1 (testcoin) pairs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1955,6 +1955,11 @@ They will be removed from the orderbook until you log in again.</source>
         <source>Explore</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../Dex/Wallet/Main.qml" line="935"/>
+        <source>Loading market data</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../../Dex/Wallet/Main.qml" line="942"/>
         <source>There is no chart data for this ticker yet</source>
@@ -1975,11 +1980,6 @@ They will be removed from the orderbook until you log in again.</source>
         <source>Please wait, %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../Dex/Wallet/Main.qml" line="935"/>
-        <source>Loading ticker chart data</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../Dex/Wallet/Main.qml" line="1003"/>
         <source>% activated...</source>
@@ -1991,18 +1991,18 @@ They will be removed from the orderbook until you log in again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="36"/>
+        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="41"/>
         <source>Chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="44"/>
+        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="49"/>
         <location filename="../../Dex/Exchange/Trade/SimpleView/Main.qml" line="110"/>
         <source>Orders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="52"/>
+        <location filename="../../Dex/Exchange/ProView/TradingInfo/Main.qml" line="57"/>
         <location filename="../../Dex/Exchange/Trade/SimpleView/Main.qml" line="120"/>
         <source>History</source>
         <translation type="unfinished"></translation>
@@ -2024,7 +2024,7 @@ They will be removed from the orderbook until you log in again.</source>
     </message>
     <message>
         <location filename="../../Dex/Addressbook/Main.qml" line="62"/>
-        <location filename="../../Dex/Addressbook/Main.qml" line="343"/>
+        <location filename="../../Dex/Addressbook/Main.qml" line="336"/>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2049,27 +2049,22 @@ They will be removed from the orderbook until you log in again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Addressbook/Main.qml" line="127"/>
-        <source>No contacts found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Dex/Addressbook/Main.qml" line="246"/>
+        <location filename="../../Dex/Addressbook/Main.qml" line="239"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Addressbook/Main.qml" line="259"/>
+        <location filename="../../Dex/Addressbook/Main.qml" line="252"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Addressbook/Main.qml" line="343"/>
+        <location filename="../../Dex/Addressbook/Main.qml" line="336"/>
         <source>address copied to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Addressbook/Main.qml" line="366"/>
+        <location filename="../../Dex/Addressbook/Main.qml" line="359"/>
         <source>This contact does not have any registered address.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3646,17 +3641,6 @@ Please select a new order.</source>
         <source>MM2 Version copied to clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="724"/>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="731"/>
-        <source>RPC Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="732"/>
-        <source>RPC Port copied to clipboard.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../Dex/Settings/SettingModal.qml" line="746"/>
         <location filename="../../Dex/Settings/SettingModal.qml" line="753"/>
@@ -3669,27 +3653,27 @@ Please select a new order.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="768"/>
+        <location filename="../../Dex/Settings/SettingModal.qml" line="724"/>
         <source>Qt version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="775"/>
+        <location filename="../../Dex/Settings/SettingModal.qml" line="731"/>
         <source>Qt Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="776"/>
+        <location filename="../../Dex/Settings/SettingModal.qml" line="732"/>
         <source>Qt Version copied to clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="801"/>
-        <source>Search for Update</source>
+        <location filename="../../Dex/Settings/SettingModal.qml" line="780"/>
+        <source>Search Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Dex/Settings/SettingModal.qml" line="818"/>
+        <location filename="../../Dex/Settings/SettingModal.qml" line="797"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4569,7 +4553,7 @@ This might take a few minutes...</source>
 <context>
     <name>atomic_dex::settings_page</name>
     <message>
-        <location filename="../../../src/core/atomicdex/pages/qt.settings.page.cpp" line="805"/>
+        <location filename="../../../src/core/atomicdex/pages/qt.settings.page.cpp" line="782"/>
         <source>An error has occurred.</source>
         <translation type="unfinished"></translation>
     </message>