Rebase / fix conflicts

bisq-network · Nov 29, 2022 · 2febe49 · 2febe49
2 parents af0bd1a + 356c984
commit 2febe49
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
@@ -1323,6 +1323,7 @@ setting.preferences.tradeLimits=Trade Limits
 setting.preferences.tradeLimitsEnabled=Increase Trade Limits
 setting.preferences.tradeLimitMax=Max. trade amount (BTC)
 setting.preferences.tradeLimitBlurb=Trading limits are set to reduce risk of costly disputes and losing funds for new \
+<<<<<<< HEAD
   users. Raise trading limits at your own risk. Every trader has their own pace, but it's recommended to complete at \
   least 5 trades before raising trade limits.\n\n\
   By raising trading limits you acknowledge to be familiar with the basic use of Bisq, like backing up your data \
@@ -1332,6 +1333,13 @@ setting.preferences.tradeLimitBlurb=Trading limits are set to reduce risk of cos
   support [HYPERLINK:https://bisq.wiki/User_support].\n\n\
   Account signing limits [HYPERLINK:https://bisq.wiki/Account_signing] are still applied to buy BTC with most National \
   Account payment methods [HYPERLINK:https://bisq.wiki/Payment_methods], to reduce chargeback risk.
+=======
+  users. Raise trading limits at your own risk. Every trader has their own pace, but it''s recommended to complete at \
+  least 5 trades before raising trade limits.\n\n\
+  By raising trading limits you acknowledge to be familiar with the basic use of Bisq, like backing up your data [HYPERLINK:https://bisq.wiki/Backing_up_application_data], \
+  trading rules [HYPERLINK:https://bisq.wiki/Trading_rules], dispute resolution [HYPERLINK:https://bisq.wiki/Dispute_resolution], penalties [HYPERLINK:https://bisq.wiki/Table_of_penalties] or find support [HYPERLINK:https://bisq.wiki/User_support].\n\n\
+  Account signing limits [HYPERLINK:https://bisq.wiki/Account_signing] are still applied to most National Account payment methods [HYPERLINK:https://bisq.wiki/Payment_methods], to reduce chargeback risk.
+>>>>>>> 356c984eac89a70f8424e529f6155594cc25a7ec
 setting.preferences.deviationToLarge=Values higher than {0}% are not allowed.
 setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte)
 setting.preferences.useCustomValue=Use custom value