mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Manfred Karrer 2018-02-13 12:27:30 -05:00
commit 2cfc1b214f
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/io/bisq/common/GlobalSettings.java
View File

@ -26,7 +26,7 @@ import java.util.Locale;
public class GlobalSettings {
private static boolean useAnimations = true;
private static Locale locale = new Locale("en", "US");
private static Locale locale = Locale.getDefault();
private static final ObjectProperty<Locale> localeProperty = new SimpleObjectProperty<>(locale);
private static TradeCurrency defaultTradeCurrency;
private static String btcDenomination;

8
common/src/main/resources/i18n/displayStrings.properties
View File

@ -533,7 +533,7 @@ The trade ID (\"reason for payment\" text) of the transaction is: \"{2}\"
portfolio.pending.step3_seller.cash=\n\nBecause the payment is done via Cash Deposit the BTC buyer has to write \"NO REFUND\" on the paper receipt, tear it in 2 parts and send you a photo by email.\n\n\
To avoid chargeback risk, only confirm if you received the email and if you are sure the paper receipt is valid.\n\
If you are not sure, {0}
portfolio.pending.step3_seller.westernUnion=The buyer has to sent you the MTCN (tracking number) and a photo of the receipt by email.\n\
portfolio.pending.step3_seller.westernUnion=The buyer has to send you the MTCN (tracking number) and a photo of the receipt by email.\n\
The receipt must clearly show your full name, city, country and the amount. Please check your email if you received the MTCN.\n\n\
After closing that popup you will see the BTC buyer's name and address for picking up the money from Western Union.\n\n\
Only confirm receipt after you have successfully picked up the money!
@ -923,7 +923,7 @@ account.altcoin.popup.ZEC.msg=When using {0} you can only use the transparent ad
the z-addresses (private), because the arbitrator would not be able to verify the transaction with z-addresses.
account.altcoin.popup.XZC.msg=When using {0} you can only use the transparent (traceable) addresses not \
the untraceable addresses, because the arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer.
account.altcoin.popup.bch=Bitcoin Cash and Bitcoin Clashic suffer from replay protection. If you use those coins be sure you take sufficient precautions and understand all implications.\
account.altcoin.popup.bch=Bitcoin Cash and Bitcoin Classic suffer from replay protection. If you use those coins be sure you take sufficient precautions and understand all implications.\
You can suffer losses by sending one coin and unintentionally send the same coins on the other block chain.\
Because those "airdrop coins" share the same history with the Bitcoin blockchain there are also security risks and a considerable risk for losing privacy.\n\n\
Please read at the Bisq Forum more about that topic: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc
@ -963,7 +963,7 @@ account.seed.warn.noPw.msg=You have not setup a wallet password which would prot
Do you want to display the seed words?
account.seed.warn.noPw.yes=Yes, and don't ask me again
account.seed.enterPw=Enter password to view seed words
account.seed.restore.info=Please note that you cannot import a wallet from an old bisq version (any version before 0.5.0), \
account.seed.restore.info=Please note that you cannot import a wallet from an old Bisq version (any version before 0.5.0), \
because the wallet format has changed!\n\n\
If you want to move the funds from the old version to the new Bisq application send it with a Bitcoin transaction.\n\n\
Also be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\n\
@ -1290,7 +1290,7 @@ torNetworkSettingWindow.deleteFiles.button=Delete outdated Tor files and shut do
torNetworkSettingWindow.deleteFiles.progress=Shut down Tor in progress
torNetworkSettingWindow.deleteFiles.success=Outdated Tor files deleted successfully. Please restart.
torNetworkSettingWindow.bridges.header=Is Tor blocked?
torNetworkSettingWindow.bridges.info=If Tor is blocked by your internet provider or in your country you can try to use Tor bridges.\n\
torNetworkSettingWindow.bridges.info=If Tor is blocked by your internet provider or by your country you can try to use Tor bridges.\n\
Visit the Tor web page at: https://bridges.torproject.org/bridges to learn more about \
bridges and pluggable transports.

5
gui/src/main/java/io/bisq/gui/app/BisqAppMain.java
View File

@ -25,17 +25,12 @@ import joptsimple.OptionException;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import java.util.Locale;
import static io.bisq.core.app.BisqEnvironment.DEFAULT_APP_NAME;
import static io.bisq.core.app.BisqEnvironment.DEFAULT_USER_DATA_DIR;
public class BisqAppMain extends BisqExecutable {
static {
// Need to set default locale initially otherwise we get problems at non-english OS
Locale.setDefault(new Locale("en", Locale.getDefault().getCountry()));
Utilities.removeCryptographyRestrictions();
}