Merge branch 'master' of github.com:bisq-network/bisq into release/v1.2.4

# Conflicts:
#	core/src/main/resources/i18n/displayStrings_zh-hant.properties

CONTRIBUTING.md

@@ -21,6 +21,7 @@ All Bisq contributors submit changes via pull requests. The workflow is as follo
  - Commit patches
  - Squash redundant or unnecessary commits
  - Submit a pull request from your topic branch back to the `master` branch of the main repository
+ - Make changes to the pull request if reviewers request them and __**request a re-review**__
 
 Pull requests should be focused on a single change. Do not mix, for example, refactorings with a bug fix or implementation of a new feature. This practice makes it easier for fellow contributors to review each pull request on its merits and to give a clear ACK/NACK (see below).
 

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

@@ -2640,7 +2640,7 @@ systemTray.show=Show application window
 systemTray.hide=Hide application window
 systemTray.info=Info about Bisq
 systemTray.exit=Exit
-systemTray.tooltip=Bisq: The decentralized exchange network
+systemTray.tooltip=Bisq: A decentralized bitcoin exchange network
 
 
 ####################################################################

desktop/package/linux/package.sh

@@ -101,7 +101,7 @@ $JAVA_HOME/bin/javapackager \
     -Bicon=$base_dir/desktop/package/linux/icon.png \
     -native deb \
     -name Bisq \
-    -title "The decentralized exchange network." \
+    -title "A decentralized bitcoin exchange network." \
     -vendor Bisq \
     -outdir $base_dir/desktop/package/linux \
     -srcdir $src_dir \
@@ -127,7 +127,7 @@ $JAVA_HOME/bin/javapackager \
     -Bicon=$base_dir/desktop/package/linux/icon.png \
     -native rpm \
     -name Bisq \
-    -title "The decentralized exchange network." \
+    -title "A decentralized bitcoin exchange network." \
     -vendor Bisq \
     -outdir $base_dir/desktop/package/linux \
     -srcdir $src_dir \

desktop/package/macosx/create_app.sh

@@ -84,7 +84,7 @@ $JAVA_HOME/bin/javapackager \
     -Bruntime="$JAVA_HOME/jre" \
     -native dmg \
     -name Bisq \
-    -title Bisq \
+    -title "A decentralized bitcoin exchange network." \
     -vendor Bisq \
     -outdir deploy \
     -srcdir deploy \

desktop/package/windows/Bisq.iss

@@ -53,16 +53,16 @@ Name: fr; MessagesFile: "compiler:Languages\French.isl"
 Name: sp; MessagesFile: "compiler:Languages\Spanish.isl"
 
 [CustomMessages]
-en.AppComments=The decentralized exchange network
+en.AppComments=A decentralized bitcoin exchange network
 en.AppIsRunning=Bisq is running, please close it and run setup again.
 en.SpecialAppPath=Your default install path appears to have special characters: %1%n%nThis may prevent Bisq from starting. See https://github.com/bisq-network/bisq/issues/3605 for more information.%n%nYou can either cancel this installation and install as a user without special characters in the username, or proceed with this installation using a different install path that does not contain special characters (e.g. %2).
-de.AppComments=Das dezentrale Austauschnetzwerk
+de.AppComments=Ein dezentrales bitcoin-Austauschnetz
 de.AppIsRunning=Bisq läuft, bitte schließen Sie es und führen Sie das Setup erneut aus.
 de.SpecialAppPath=Ihr Standardinstallationspfad scheint Sonderzeichen zu enthalten: %1%n%nDies kann den Start von Bisq verhindern. Weitere Informationen finden Sie unter https://github.com/bisq-network/bisq/issues/3605.%n%nSie können diese Installation abbrechen und als Benutzer ohne Sonderzeichen im Benutzernamen installieren oder mit dieser Installation fortfahren, indem Sie einen anderen Installationspfad verwenden, der keine Sonderzeichen enthält (z. B. %2).
-fr.AppComments=Le réseau d'échange décentralisé
+fr.AppComments=Un réseau d’échange bitcoin décentralisé
 fr.AppIsRunning=Bisq est en cours d'exécution, fermez-le et exécutez à nouveau le programme d'installation.
 fr.SpecialAppPath=Votre chemin d'installation par défaut semble comporter des caractères spéciaux: %1%n%nCela peut empêcher le démarrage de Bisq. Voir https://github.com/bisq-network/bisq/issues/3605 pour plus d'informations.%n%nVous pouvez annuler cette installation et l'installer en tant qu'utilisateur sans caractères spéciaux dans le nom d'utilisateur ou procéder à cette installation en utilisant un chemin d'installation différent ne contenant pas de caractères spéciaux (par exemple, %2).
-sp.AppComments=La red de intercambio descentralizado
+sp.AppComments=Una red descentralizada de intercambio de bitcoin
 sp.AppIsRunning=Bisq se está ejecutando, ciérrelo y vuelva a ejecutar la configuración.
 sp.SpecialAppPath=Su ruta de instalación predeterminada parece tener caracteres especiales: %1%n%nEsto puede evitar que Bisq se inicie. Consulte https://github.com/bisq-network/bisq/issues/3605 para obtener más información.%n%nPuede cancelar esta instalación e instalar como usuario sin caracteres especiales en el nombre de usuario, o continuar con esta instalación utilizando una ruta de instalación diferente que no contenga caracteres especiales (por ejemplo, %2).
 

pull_request_template.md

@@ -0,0 +1,13 @@
+<!-- 
+- make yourself familiar with the CONTRIBUTING.md if you have not already (https://github.com/bisq-network/bisq/blob/master/CONTRIBUTING.md)
+- make sure you follow our [coding style guidelines][https://github.com/bisq-network/style/issues)
+- pick a descriptive title
+- provide some meaningful PR description below
+- create the PR
+- in case you receive a "Change request" and/or a NACK, please react within 30 days. If not, we will close your PR and it can not be up for compensation.
+- After addressing the change request, __please re-request a review!__ Otherwise we might miss your PR as we tend to only look at pull requests tagged with a "review required".
+-->
+
+Fixes #replaceWithIssueNr, fixes #replaceWithIssueNr
+
+Your PR description here.