Merge branch 'update-data-stores-for-v1.9.16' into re-integrate-inven…

…tory-module_forward-merge

build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/PackagingPlugin.kt

@@ -22,7 +22,7 @@ import javax.inject.Inject
 class PackagingPlugin @Inject constructor(private val javaToolchainService: JavaToolchainService) : Plugin<Project> {
 
     companion object {
-        const val APP_VERSION = "1.9.15"
+        const val APP_VERSION = "1.9.16"
         const val OUTPUT_DIR_PATH = "packaging/jpackage/packages"
     }
 

common/src/main/java/bisq/common/app/Version.java

@@ -36,7 +36,7 @@ public class Version {
     // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "1.9.15";
+    public static final String VERSION = "1.9.16";
 
     /**
      * Holds a list of the tagged resource files for optimizing the getData requests.
@@ -45,7 +45,7 @@ public class Version {
      */
     public static final List<String> HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2",
             "1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5", "1.7.2", "1.7.4", "1.8.0", "1.8.1", "1.8.3", "1.9.0", "1.9.3",
-            "1.9.5", "1.9.6", "1.9.7", "1.9.10", "1.9.11", "1.9.13", "1.9.15");
+            "1.9.5", "1.9.6", "1.9.7", "1.9.10", "1.9.11", "1.9.13", "1.9.15", "1.9.16");
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);

core/src/main/resources/i18n/displayStrings_cs.properties

@@ -101,6 +101,8 @@ shared.dontRemoveOffer=Neodstraňovat nabídku
 shared.editOffer=Upravit nabídku
 shared.duplicateOffer=Duplikovat nabídku
 shared.openLargeQRWindow=Otevřít velké okno s QR kódem
+shared.showSepaQRCode=Show SEPA QR Code
+shared.maximizedToProtectPrivacy=In order to protect your privacy, the QR Code will be shown maximized over the application window.
 shared.chooseTradingAccount=Vybrat obchodní účet
 shared.faq=Navštívit stránku FAQ
 shared.yesCancel=Ano, zrušit
@@ -1151,11 +1153,11 @@ settings.preferences.languageChange=Chcete-li použít změnu jazyka na všech o
 settings.preferences.supportLanguageWarning=V případě sporu mějte na paměti, že zprostředkování je řešeno v {0} a arbitráž v {1}.
 setting.preferences.daoOptions=Možnosti DAO
 
-setting.preferences.dao.resyncBMAccFromScratch=Resync from scratch
+setting.preferences.dao.resyncBMAccFromScratch=Recalculate accounting data from scratch
 setting.preferences.dao.resyncBMAccFromScratch.popup=To resync the Burningmen accounting data from scratch you need to run a full Bitcoin node.\nIt will take considerable time and CPU resources as it resyncs from 2020 when legacy BM started. Depending on your CPU resources that can take 20-40 hours.\n\nAre you sure you want to do that?\n\nMostly a resync from latest resource files is sufficient and much faster.\n\nIf you proceed, after an application restart the Burningmen accounting data will be rebuild from the transactions requested from your Bitcoin node.
 setting.preferences.dao.resyncBMAccFromScratch.resync=Resync from scratch and shutdown
 setting.preferences.dao.isFullBMAccountingNode=Full BM accounting node
-setting.preferences.dao.resyncBMAccFromResources=Resync from resources
+setting.preferences.dao.resyncBMAccFromResources=Recalculate accounting data from resources
 setting.preferences.dao.resyncBMAccFromResources.popup=To resync the Burningmen accounting data from resources you will reapply the data from resources of your last downloaded Bisq version and load the missing data from the network.\nDepending on the age of your last Bisq download that might take a while.\n\nAre you sure you want to do that?
 setting.preferences.dao.resyncBMAccFromResources.resync=Resync from resources and shutdown
 
@@ -1396,6 +1398,7 @@ account.fiat.exportAccountAge=Export account age for Bisq 2
 account.fiat.exportAccountAge.popup=Your 'account age' and Bisq 2 profile ID got signed and the data is copied to the clipboard.\n\n\This is the data in json format:\n\n\{0}\n\nGo back to Bisq 2 and follow the instructions there.
 account.fiat.signedWitness=Export signed witness for Bisq 2
 account.fiat.signedWitness.popup=Your 'signed account age witness' and Bisq 2 profile ID got signed and the data is copied to the clipboard.\n\n\This is the data in json format:\n\n\{0}\n\nGo back to Bisq 2 and follow the instructions there.
+account.fiat.bisq2profileId=Profile ID from Bisq 2
 account.backup.title=Zálohujte peněženku
 account.backup.location=Umístění zálohy
 account.backup.selectLocation=Zvolte umístění zálohy
@@ -1478,6 +1481,7 @@ account.notifications.marketAlert.message.msg=Do nabídky Bisq byla zveřejněna
 account.notifications.priceAlert.message.title=Upozornění na cenu pro {0}
 account.notifications.priceAlert.message.msg=Vaše upozornění na cenu bylo aktivováno. Aktuální {0} cena je {1} {2}
 account.notifications.noWebCamFound.warning=Nebyla nalezena žádná webkamera.\n\nPoužijte e-mailu k odeslání tokenu a šifrovacího klíče z vašeho mobilního telefonu do aplikace Bisq.
+account.notifications.webcam.error=An error has occurred with the webcam.
 account.notifications.priceAlert.warning.highPriceTooLow=Vyšší cena musí být větší než nižší cena.
 account.notifications.priceAlert.warning.lowerPriceTooHigh=Nižší cena musí být nižší než vyšší cena.
 
@@ -1744,7 +1748,7 @@ dao.bond.bondedRoleType.FORUM_ADMIN=Bisq 2 release manager
 # suppress inspection "UnusedProperty"
 dao.bond.bondedRoleType.TWITTER_ADMIN=Twitter admin
 # suppress inspection "UnusedProperty"
-dao.bond.bondedRoleType.ROCKET_CHAT_ADMIN=Keybase admin
+dao.bond.bondedRoleType.ROCKET_CHAT_ADMIN=Community admin
 # suppress inspection "UnusedProperty"
 dao.bond.bondedRoleType.YOUTUBE_ADMIN=Bisq 2 moderator
 # suppress inspection "UnusedProperty"

core/src/main/resources/i18n/displayStrings_de.properties

@@ -101,6 +101,8 @@ shared.dontRemoveOffer=Angebot nicht entfernen
 shared.editOffer=Angebot bearbeiten
 shared.duplicateOffer=Angebot kopieren
 shared.openLargeQRWindow=Großes QR-Code Fenster öffnen
+shared.showSepaQRCode=Show SEPA QR Code
+shared.maximizedToProtectPrivacy=In order to protect your privacy, the QR Code will be shown maximized over the application window.
 shared.chooseTradingAccount=Handelskonto auswählen
 shared.faq=Zur FAQ Seite
 shared.yesCancel=Ja, abbrechen
@@ -1151,11 +1153,11 @@ settings.preferences.languageChange=Um den Sprachwechsel auf alle Bildschirme an
 settings.preferences.supportLanguageWarning=Wenn es zu einem Streitfall kommen sollte, beachten Sie bitte, dass die Mediation in {0} und das Vermittlungsverfahren in {1} geregelt wird.
 setting.preferences.daoOptions=DAO-Optionen
 
-setting.preferences.dao.resyncBMAccFromScratch=Resync from scratch
+setting.preferences.dao.resyncBMAccFromScratch=Recalculate accounting data from scratch
 setting.preferences.dao.resyncBMAccFromScratch.popup=To resync the Burningmen accounting data from scratch you need to run a full Bitcoin node.\nIt will take considerable time and CPU resources as it resyncs from 2020 when legacy BM started. Depending on your CPU resources that can take 20-40 hours.\n\nAre you sure you want to do that?\n\nMostly a resync from latest resource files is sufficient and much faster.\n\nIf you proceed, after an application restart the Burningmen accounting data will be rebuild from the transactions requested from your Bitcoin node.
 setting.preferences.dao.resyncBMAccFromScratch.resync=Resync from scratch and shutdown
 setting.preferences.dao.isFullBMAccountingNode=Full BM accounting node
-setting.preferences.dao.resyncBMAccFromResources=Resync from resources
+setting.preferences.dao.resyncBMAccFromResources=Recalculate accounting data from resources
 setting.preferences.dao.resyncBMAccFromResources.popup=To resync the Burningmen accounting data from resources you will reapply the data from resources of your last downloaded Bisq version and load the missing data from the network.\nDepending on the age of your last Bisq download that might take a while.\n\nAre you sure you want to do that?
 setting.preferences.dao.resyncBMAccFromResources.resync=Resync from resources and shutdown
 
@@ -1396,6 +1398,7 @@ account.fiat.exportAccountAge=Alter des Kontos für Bisq 2 exportieren
 account.fiat.exportAccountAge.popup=Your 'account age' and Bisq 2 profile ID got signed and the data is copied to the clipboard.\n\n\This is the data in json format:\n\n\{0}\n\nGo back to Bisq 2 and follow the instructions there.
 account.fiat.signedWitness=Signiertes Alter für Bisq 2 exportieren
 account.fiat.signedWitness.popup=Your 'signed account age witness' and Bisq 2 profile ID got signed and the data is copied to the clipboard.\n\n\This is the data in json format:\n\n\{0}\n\nGo back to Bisq 2 and follow the instructions there.
+account.fiat.bisq2profileId=Profile ID from Bisq 2
 account.backup.title=Backup der Wallet erstellen
 account.backup.location=Speicherort des Backups
 account.backup.selectLocation=Speicherort des Backups wählen
@@ -1478,6 +1481,7 @@ account.notifications.marketAlert.message.msg=Eine neue "{0} {1}" Angebote mit {
 account.notifications.priceAlert.message.title=Preisalarm für {0}
 account.notifications.priceAlert.message.msg=Ihr Preisalarm wurde ausgelöst. Der momentane {0} Preis ist {1} {2}
 account.notifications.noWebCamFound.warning=Keine Webcam gefunden.\n\nBitte nutzen Sie die E-Mail Option um den Token und Schlüssel von Ihrem Smartphone zur Bisq-Anwendung zu senden.
+account.notifications.webcam.error=An error has occurred with the webcam.
 account.notifications.priceAlert.warning.highPriceTooLow=Der hohe Preis muss größer als der tiefe Preis sein.
 account.notifications.priceAlert.warning.lowerPriceTooHigh=Der tiefe Preis muss kleiner als der hohe Preis sein.
 
@@ -1744,7 +1748,7 @@ dao.bond.bondedRoleType.FORUM_ADMIN=Bisq 2 release manager
 # suppress inspection "UnusedProperty"
 dao.bond.bondedRoleType.TWITTER_ADMIN=Twitter Administrator
 # suppress inspection "UnusedProperty"
-dao.bond.bondedRoleType.ROCKET_CHAT_ADMIN=Keybase Admin
+dao.bond.bondedRoleType.ROCKET_CHAT_ADMIN=Community admin
 # suppress inspection "UnusedProperty"
 dao.bond.bondedRoleType.YOUTUBE_ADMIN=Bisq 2 moderator
 # suppress inspection "UnusedProperty"

core/src/main/resources/i18n/displayStrings_es.properties

@@ -101,6 +101,8 @@ shared.dontRemoveOffer=No eliminar oferta
 shared.editOffer=Editar oferta
 shared.duplicateOffer=Duplicar oferta
 shared.openLargeQRWindow=Abrir código QR en ventana grande
+shared.showSepaQRCode=Show SEPA QR Code
+shared.maximizedToProtectPrivacy=In order to protect your privacy, the QR Code will be shown maximized over the application window.
 shared.chooseTradingAccount=Elija cuenta de intercambio
 shared.faq=Visitar web preguntas frecuentes
 shared.yesCancel=Sí, cancelar
@@ -1151,11 +1153,11 @@ settings.preferences.languageChange=Para aplicar un cambio de idioma en todas la
 settings.preferences.supportLanguageWarning=En caso de disputa, tenga en cuenta que la mediación se maneja en {0} y el arbitraje en {1}.
 setting.preferences.daoOptions=Opciones de DAO
 
-setting.preferences.dao.resyncBMAccFromScratch=Resync from scratch
+setting.preferences.dao.resyncBMAccFromScratch=Recalculate accounting data from scratch
 setting.preferences.dao.resyncBMAccFromScratch.popup=To resync the Burningmen accounting data from scratch you need to run a full Bitcoin node.\nIt will take considerable time and CPU resources as it resyncs from 2020 when legacy BM started. Depending on your CPU resources that can take 20-40 hours.\n\nAre you sure you want to do that?\n\nMostly a resync from latest resource files is sufficient and much faster.\n\nIf you proceed, after an application restart the Burningmen accounting data will be rebuild from the transactions requested from your Bitcoin node.
 setting.preferences.dao.resyncBMAccFromScratch.resync=Resync from scratch and shutdown
 setting.preferences.dao.isFullBMAccountingNode=Full BM accounting node
-setting.preferences.dao.resyncBMAccFromResources=Resync from resources
+setting.preferences.dao.resyncBMAccFromResources=Recalculate accounting data from resources
 setting.preferences.dao.resyncBMAccFromResources.popup=To resync the Burningmen accounting data from resources you will reapply the data from resources of your last downloaded Bisq version and load the missing data from the network.\nDepending on the age of your last Bisq download that might take a while.\n\nAre you sure you want to do that?
 setting.preferences.dao.resyncBMAccFromResources.resync=Resync from resources and shutdown
 
@@ -1396,6 +1398,7 @@ account.fiat.exportAccountAge=Export account age for Bisq 2
 account.fiat.exportAccountAge.popup=Your 'account age' and Bisq 2 profile ID got signed and the data is copied to the clipboard.\n\n\This is the data in json format:\n\n\{0}\n\nGo back to Bisq 2 and follow the instructions there.
 account.fiat.signedWitness=Export signed witness for Bisq 2
 account.fiat.signedWitness.popup=Your 'signed account age witness' and Bisq 2 profile ID got signed and the data is copied to the clipboard.\n\n\This is the data in json format:\n\n\{0}\n\nGo back to Bisq 2 and follow the instructions there.
+account.fiat.bisq2profileId=Profile ID from Bisq 2
 account.backup.title=Copia de seguridad del monedero
 account.backup.location=Ubicación de la copia de seguridad
 account.backup.selectLocation=Seleccionar localización de la copia de seguridad
@@ -1478,6 +1481,7 @@ account.notifications.marketAlert.message.msg=Una nueva oferta "{0} {1}" con el
 account.notifications.priceAlert.message.title=Alerta de precio para {0}
 account.notifications.priceAlert.message.msg=Su alerta de precio se ejecutó. El precio actual de {0} es {1} {2}
 account.notifications.noWebCamFound.warning=No se ha encontrado una webcam.\n\nPor favor use la opción de email para enviar el token y clave de encriptación desde su teléfono móvil a la aplicación Bisq.
+account.notifications.webcam.error=An error has occurred with the webcam.
 account.notifications.priceAlert.warning.highPriceTooLow=El precio superior debe ser mayor que el precio inferior.
 account.notifications.priceAlert.warning.lowerPriceTooHigh=El precio inferior debe ser más bajo que el precio superior.
 
@@ -1744,7 +1748,7 @@ dao.bond.bondedRoleType.FORUM_ADMIN=Bisq 2 release manager
 # suppress inspection "UnusedProperty"
 dao.bond.bondedRoleType.TWITTER_ADMIN=Admin Twitter
 # suppress inspection "UnusedProperty"
-dao.bond.bondedRoleType.ROCKET_CHAT_ADMIN=Administrador de Keybase
+dao.bond.bondedRoleType.ROCKET_CHAT_ADMIN=Community admin
 # suppress inspection "UnusedProperty"
 dao.bond.bondedRoleType.YOUTUBE_ADMIN=Bisq 2 moderator
 # suppress inspection "UnusedProperty"

core/src/main/resources/i18n/displayStrings_fa.properties

@@ -101,6 +101,8 @@ shared.dontRemoveOffer=پیشنهاد را حذف نکنید
 shared.editOffer=ویرایش پیشنهاد
 shared.duplicateOffer=Duplicate offer
 shared.openLargeQRWindow=Open large QR code window
+shared.showSepaQRCode=Show SEPA QR Code
+shared.maximizedToProtectPrivacy=In order to protect your privacy, the QR Code will be shown maximized over the application window.
 shared.chooseTradingAccount=Choose trading account
 shared.faq=Visit FAQ page
 shared.yesCancel=بله، لغو شود
@@ -1151,11 +1153,11 @@ settings.preferences.languageChange=اعمال تغییر زبان به تمام
 settings.preferences.supportLanguageWarning=In case of a dispute, please note that mediation is handled in {0} and arbitration in {1}.
 setting.preferences.daoOptions=گزینه‌های DAO
 
-setting.preferences.dao.resyncBMAccFromScratch=Resync from scratch
+setting.preferences.dao.resyncBMAccFromScratch=Recalculate accounting data from scratch
 setting.preferences.dao.resyncBMAccFromScratch.popup=To resync the Burningmen accounting data from scratch you need to run a full Bitcoin node.\nIt will take considerable time and CPU resources as it resyncs from 2020 when legacy BM started. Depending on your CPU resources that can take 20-40 hours.\n\nAre you sure you want to do that?\n\nMostly a resync from latest resource files is sufficient and much faster.\n\nIf you proceed, after an application restart the Burningmen accounting data will be rebuild from the transactions requested from your Bitcoin node.
 setting.preferences.dao.resyncBMAccFromScratch.resync=Resync from scratch and shutdown
 setting.preferences.dao.isFullBMAccountingNode=Full BM accounting node
-setting.preferences.dao.resyncBMAccFromResources=Resync from resources
+setting.preferences.dao.resyncBMAccFromResources=Recalculate accounting data from resources
 setting.preferences.dao.resyncBMAccFromResources.popup=To resync the Burningmen accounting data from resources you will reapply the data from resources of your last downloaded Bisq version and load the missing data from the network.\nDepending on the age of your last Bisq download that might take a while.\n\nAre you sure you want to do that?
 setting.preferences.dao.resyncBMAccFromResources.resync=Resync from resources and shutdown
 
@@ -1396,6 +1398,7 @@ account.fiat.exportAccountAge=Export account age for Bisq 2
 account.fiat.exportAccountAge.popup=Your 'account age' and Bisq 2 profile ID got signed and the data is copied to the clipboard.\n\n\This is the data in json format:\n\n\{0}\n\nGo back to Bisq 2 and follow the instructions there.
 account.fiat.signedWitness=Export signed witness for Bisq 2
 account.fiat.signedWitness.popup=Your 'signed account age witness' and Bisq 2 profile ID got signed and the data is copied to the clipboard.\n\n\This is the data in json format:\n\n\{0}\n\nGo back to Bisq 2 and follow the instructions there.
+account.fiat.bisq2profileId=Profile ID from Bisq 2
 account.backup.title=کیف پول پشتیبان
 account.backup.location=محل پشتیبان‌گیری
 account.backup.selectLocation=انتخاب محل پشتیبان گیری
@@ -1478,6 +1481,7 @@ account.notifications.marketAlert.message.msg=پیشنهاد جدید ''{0} {1}'
 account.notifications.priceAlert.message.title=هشدار قیمت برای {0}
 account.notifications.priceAlert.message.msg=هشدار قیمت شما فعال شده است. قیمت {0} فعلی {1} {2} است
 account.notifications.noWebCamFound.warning=دوبین پیدا نشد.\n\nلطفا از گزینه ایمیل برای ارسال توکن و کلید رمزنگاری از تلفن همراهتان به برنامه Bisq استفاده کنید.
+account.notifications.webcam.error=An error has occurred with the webcam.
 account.notifications.priceAlert.warning.highPriceTooLow=قیمت بالاتر باید از قیمت پایین‌تر بزرگتر باشد.
 account.notifications.priceAlert.warning.lowerPriceTooHigh=قیمت پایین‌تر باید از قیمت بالاتر کوچکتر باشد.
 
@@ -1744,7 +1748,7 @@ dao.bond.bondedRoleType.FORUM_ADMIN=Bisq 2 release manager
 # suppress inspection "UnusedProperty"
 dao.bond.bondedRoleType.TWITTER_ADMIN=مدیر توئیتر
 # suppress inspection "UnusedProperty"
-dao.bond.bondedRoleType.ROCKET_CHAT_ADMIN=Keybase admin
+dao.bond.bondedRoleType.ROCKET_CHAT_ADMIN=Community admin
 # suppress inspection "UnusedProperty"
 dao.bond.bondedRoleType.YOUTUBE_ADMIN=Bisq 2 moderator
 # suppress inspection "UnusedProperty"