Skip to content

Commit

Permalink
fix: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
aswathy-deriv committed Nov 7, 2023
2 parents e8a7569 + b81b9e7 commit 65ef202
Show file tree
Hide file tree
Showing 4 changed files with 4,570 additions and 4,566 deletions.
4 changes: 4 additions & 0 deletions crowdin/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@
"554014185": "Online trading is exciting, but it can be addictive. Deriv.com provides you with the opportunity to either self-exclude or set limits on your trading activities on this website.",
"554620691": "Please enter a valid number",
"554672635": "3. Use a logic block to check if <0>Total profit/loss</0> is more than the <0>Stop loss threshold</0> amount. You can find the <0>Total profit/loss</0> variable under <0>Analysis > Stats</0> on the <0>Blocks menu</0> on the left. Your bot will continue to purchase new contracts until the <0>Total profit/loss</0> amount exceeds the <0>Stop loss threshold</0> amount.",
"554856552": "To register as a Deriv IB, you must meet the following criteria:",
"557095822": "Click the <0>Renew</0> button to renew the service or the <0>Unsubscribe</0> button to cancel the subscription.",
"558735677": "Can I open multiple Asians contracts simultaneously?",
"560142031": "Available 24/7, our synthetic indices emulate price movements of real-world markets with varying levels of volatility. As they aren't based on actual underlying assets, they are unaffected by real-world market events. The pricing of our synthetic indices is backed by algorithms that are audited for fairness by an independent third party. Read <0>this article</0> to learn more about trading synthetic indices on Deriv.",
Expand Down Expand Up @@ -916,6 +917,7 @@
"878676836": "Key information documents",
"878897196": "Deal cancellation isn’t available for Crash and Boom indices. The stop-out feature will close your contract automatically when your loss reaches or exceeds a percentage of your stake. The stop-out percentage is shown below your stake on Deriv Trader and varies according to your chosen multiplier.",
"878922748": "What is the CFDs account?",
"880363071": "Deriv Master Affiliate Programme",
"881413021": "Why trade commodities on Deriv",
"882216897": "Email is required",
"882980057": "Trading available everyday",
Expand Down Expand Up @@ -948,6 +950,7 @@
"907733837": "Predict whether the market price will touch or not touch the chosen barrier (target) during the contract period.",
"909083576": "404 - Page not found | Deriv",
"910572263": "1. Create the following variables and place them under <0>Run once at start</0>:",
"910806943": "You’ll earn a fixed commission based on the volume of individual trades bought by your referred clients.",
"912406629": "Follow these steps:",
"913276286": "1. Go to your <0>Deriv MT5 dashboard</0>.",
"913548355": "Connect with fellow traders and transfer money in minutes.",
Expand Down Expand Up @@ -1988,6 +1991,7 @@
"1899843488": "margin calculator",
"1900817499": "Stocks, ETFs, & stock indices",
"1902324847": "With these indices, there is an average of one drop (crash) or one spike (boom) in prices that occur in <0>a series of 300 ticks.</0>",
"1902398472": "Yes, you can. You will need to notify your account manager if you wish to do so.",
"1903084812": "Choose from {{platform_count}} powerful platforms — designed with you in mind",
"1903393516": "Our Deriv support community can help you find answers.",
"1903495030": "For synthetic accounts, the stop loss and/or take profit pip value is in USD.",
Expand Down
Loading

0 comments on commit 65ef202

Please sign in to comment.