Skip to content

Commit

Permalink
Merge commit 'ece3f4725d7ebb2dfd54d5014ce2fce0e1c14c71' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@bigearsenal
bigearsenal committed Feb 28, 2024
2 parents 8294fd2 + ece3f47 commit 8bcb3fa
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 31 deletions.
4 changes: 2 additions & 2 deletions p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Kingfisher.git",
"state" : {
"revision" : "5b92f029fab2cce44386d28588098b5be0824ef5",
"version" : "7.11.0"
"revision" : "3ec0ab0bca4feb56e8b33e289c9496e89059dd08",
"version" : "7.10.2"
}
},
{
Expand Down
58 changes: 30 additions & 28 deletions p2p_wallet/Resources/en.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
"%@ Liquidity fee" = "%@ Liquidity fee";
"%@ Liquidity fee %@" = "%@ Liquidity fee %@";
"%@ all the time" = "%@ all the time";
"%@ doesn't work. Try another option" = "%@ doesn't work. Try another option";
"%@ found" = "%@ found";
"%@ is the minimum amount to receive from the Ethereum Network" = "%@ is the minimum amount to receive from the Ethereum Network";
"%@ is unavailable" = "%@ is unavailable";
"%@ purchase cost" = "%@ purchase cost";
"%@ to %@" = "%@ to %@";
"%@ transactions" = "%@ transactions";
"%@%% last 24h" = "%@%% last 24h";
"%@\nPlease log in with the correct %@ account." = "%@\nPlease log in with the correct %@ account.";
"0%% fees" = "0%% fees";
"1%% fee" = "1%% fee";
Expand Down Expand Up @@ -48,6 +51,8 @@
"Balance" = "Balance";
"Bank card" = "Bank card";
"Bank transfer" = "Bank transfer";
"Based on absolute and relative profitability of each trade. It shows the relative potential %% profits or losses of your trading strategy." = "Based on absolute and relative profitability of each trade. It shows the relative potential %% profits or losses of your trading strategy.";
"Be save and carefull" = "Be save and carefull";
"Best price" = "Best price";
"Bitcoin" = "Bitcoin";
"Blockhash not found" = "Blockhash not found";
Expand All @@ -62,6 +67,8 @@
"Buying %@ as the base currency" = "Buying %@ as the base currency";
"By continuing, you agree to Key App’s" = "By continuing, you agree to Key App’s";
"Calculated by subtracting the account creation fee from your balance" = "Calculated by subtracting the account creation fee from your balance";
"Calculated by subtracting the token 2022 transfer fee and account creation fee from your balance" = "Calculated by subtracting the token 2022 transfer fee and account creation fee from your balance";
"Calculated by subtracting the token 2022 transfer fee from your balance" = "Calculated by subtracting the token 2022 transfer fee from your balance";
"Calculating the fees" = "Calculating the fees";
"Cancel" = "Cancel";
"Cannot calculate fees. Try again" = "Cannot calculate fees. Try again";
Expand All @@ -74,6 +81,8 @@
"Change my PIN" = "Change my PIN";
"Change the region manually" = "Change the region manually";
"Changed language to %@" = "Changed language to %@";
"Charge that you need to pay to send or receive tokenA. It helps maintain the network and ensure smooth transactions." = "Charge that you need to pay to send or receive tokenA. It helps maintain the network and ensure smooth transactions.";
"Charge that you need to pay to send or receive tokens-2022. It helps maintain the network and ensure smooth transactions." = "Charge that you need to pay to send or receive tokens-2022. It helps maintain the network and ensure smooth transactions.";
"Check available funds" = "Check available funds";
"Choose a recipient" = "Choose a recipient";
"Choose an option to continue" = "Choose an option to continue";
Expand Down Expand Up @@ -159,6 +168,7 @@
"Error with deleting. Try again" = "Error with deleting. Try again";
"Estimated fees" = "Estimated fees";
"Exchanging %@ → %@" = "Exchanging %@ → %@";
"Explorer" = "Explorer";
"Face ID" = "Face ID";
"Failed to get data" = "Failed to get data";
"Fee" = "Fee";
Expand All @@ -176,8 +186,10 @@
"Funds were sent" = "Funds were sent";
"Go back" = "Go back";
"Got it" = "Got it";
"Here’s how do we count your profits for total balance and every single token" = "Here’s how do we count your profits for total balance and every single token";
"Here’s what we found" = "Here’s what we found";
"Hey, I've sent you %@ %@! Get it here: %@" = "Hey, I've sent you %@ %@! Get it here: %@";
"Hey, let’s swap trendy meme coins with me!" = "Hey, let’s swap trendy meme coins with me!";
"Hidden tokens" = "Hidden tokens";
"Hide" = "Hide";
"Hide zero balances" = "Hide zero balances";
Expand Down Expand Up @@ -213,9 +225,11 @@
"Keep your pin safe. Hide your pin from other people." = "Keep your pin safe. Hide your pin from other people.";
"Key App" = "Key App";
"Key App cannot scan QR codes without access to your camera. Please enable access under Privacy settings." = "Key App cannot scan QR codes without access to your camera. Please enable access under Privacy settings.";
"Key App doesn’t make any profit from this swap 💚" = "Key App doesn’t make any profit from this swap 💚";
"Key App one-time transfer link" = "Key App one-time transfer link";
"Key App respects your privacy - it can't access your funds or personal details. Your information stays securely stored on your device and in the blockchain" = "Key App respects your privacy - it can't access your funds or personal details. Your information stays securely stored on your device and in the blockchain.";
"Key App’s" = "Key App’s";
"KeyApp swap fee" = "KeyApp swap fee";
"Less than %@" = "Less than %@";
"Let's go" = "Let's go";
"Let’s continue" = "Let’s continue";
Expand Down Expand Up @@ -245,6 +259,7 @@
"Multi-factor authentication" = "Multi-factor authentication";
"My Ethereum address" = "My Ethereum address";
"My Solana address" = "My Solana address";
"My crypto" = "My crypto";
"My username" = "My username";
"Name was booked" = "Name was booked";
"Network" = "Network";
Expand All @@ -267,6 +282,8 @@
"Only you have access to your funds. You can recover your wallet using your phone or email" = "Only you have access to your funds. You can recover your wallet using your phone or email";
"Oops! Something happened." = "Oops! Something happened.";
"Oops, something went wrong.\nPlease try again later" = "Oops, something went wrong.\nPlease try again later";
"Open SOLScan" = "Open SOLScan";
"Open details" = "Open details";
"Open settings" = "Open settings";
"Other tokens" = "Other tokens";
"PIN code" = "PIN code";
Expand Down Expand Up @@ -298,12 +315,15 @@
"Recently used" = "Recently used";
"Recipient gets" = "Recipient gets";
"Recipient’s address" = "Recipient’s address";
"Referral program" = "Referral program";
"Referral reward" = "Referral reward";
"Refresh" = "Refresh";
"Remove from history" = "Remove from history";
"Repeat social auth" = "Repeat social auth";
"Response error" = "Response error";
"Restore" = "Restore";
"Restore your wallet" = "Restore your wallet";
"Result of an investment, trading strategy per 24 hours" = "Result of an investment, trading strategy per 24 hours";
"SMS will not be delivered. Please change phone number" = "SMS will not be delivered. Please change phone number";
"SOL was sent to Moonpay and is being processed. Any questions regarding your transaction can be answered via" = "SOL was sent to Moonpay and is being processed. Any questions regarding your transaction can be answered via";
"Save" = "Save";
Expand Down Expand Up @@ -333,6 +353,7 @@
"Set up" = "Set up";
"Settings" = "Settings";
"Share" = "Share";
"Share my link" = "Share my link";
"Share your link to send money" = "Share your link to send money";
"Show" = "Show";
"Show my seed phrase" = "Show my seed phrase";
Expand All @@ -343,6 +364,7 @@
"Socket returns an error" = "Socket returns an error";
"Solana Name Service doesn't respond." = "Solana Name Service doesn't respond.";
"Solana has some problems" = "Solana has some problems";
"Solscan" = "Solscan";
"Something went wrong" = "Something went wrong";
"Something went wrong. Please try again" = "Something went wrong. Please try again";
"Something wrong with phone number %@ or settings. If you wish to report the issue, use error code #%@" = "Something wrong with phone number %@ or settings. If you wish to report the issue, use error code #%@";
Expand All @@ -360,6 +382,7 @@
"Swap" = "Swap";
"Swap %@ → %@" = "Swap %@ → %@";
"Swap details" = "Swap details";
"Swap fee" = "Swap fee";
"Swap your cryptocurrencies\nto SOL to cash out" = "Swap your cryptocurrencies\nto SOL to cash out";
"Swapping" = "Swapping";
"Swapping Through" = "Swapping Through";
Expand All @@ -369,6 +392,7 @@
"Tap for details" = "Tap for details";
"Tap to switch to %@" = "Tap to switch to %@";
"Tap to try again" = "Tap to try again";
"Terms & Conditions" = "Terms & Conditions";
"Terms of Service" = "Terms of Service";
"The %@ fee was reserved, so you wouldn't pay it again the next time you created a transaction of the same type." = "The %@ fee was reserved, so you wouldn't pay it again the next time you created a transaction of the same type.";
"The address %@ is recognized" = "The address %@ is recognized";
Expand All @@ -392,6 +416,7 @@
"The price is higher because of your trade size. Consider splitting your transaction into multiple swaps." = "The price is higher because of your trade size. Consider splitting your transaction into multiple swaps.";
"The seed phrase doesn't match. Please try again" = "The seed phrase doesn't match. Please try again";
"The slippage could be" = "The slippage could be";
"The token %@ from your swap link seems suspicious, therefore we've refreshed swap pair to default." = "The token %@ from your swap link seems suspicious, therefore we've refreshed swap pair to default.";
"The token %@ is out of the strict list" = "The token %@ is out of the strict list";
"The transaction has been rejected" = "The transaction has been rejected";
"The transaction has been successfully completed" = "The transaction has been successfully completed";
Expand Down Expand Up @@ -421,9 +446,12 @@
"To send %@ to Ethereum network you have to swap it to %@" = "To send %@ to Ethereum network you have to swap it to %@";
"To your bank account" = "To your bank account";
"Today" = "Today";
"Token 2022 details" = "Token 2022 details";
"Token 2022 transfer fee" = "Token 2022 transfer fee";
"Token not found. Try another one" = "Token not found. Try another one";
"Token you pay" = "Token you pay";
"Token you receive" = "Token you receive";
"Token-2022 transfer fee" = "Token-2022 transfer fee";
"Tokens" = "Tokens";
"Top up your account to get started" = "Top up your account to get started";
"Total" = "Total";
Expand All @@ -447,6 +475,7 @@
"Unable to access camera" = "Unable to access camera";
"Unauthorized" = "Unauthorized";
"Unfortunately, you can not buy in %@, but you can still use other Key App features" = "Unfortunately, you can not buy in %@, but you can still use other Key App features";
"Unfortunately, you can not cashout in %@, but you can still use other Key App features" = "Unfortunately, you can not cashout in %@, but you can still use other Key App features";
"Unique one-time link works once only" = "Unique one-time link works once only";
"Unknown" = "Unknown";
"Unknown date" = "Unknown date";
Expand All @@ -456,6 +485,7 @@
"Unstake" = "Unstake";
"Unstake signature" = "Unstake signature";
"Update" = "Update";
"Update available" = "Update available";
"Updating" = "Updating";
"Use a seed phrase" = "Use a seed phrase";
"Use an another phone" = "Use an another phone";
Expand Down Expand Up @@ -570,31 +600,3 @@
"✌️ Great! Your new PIN is set." = "✌️ Great! Your new PIN is set.";
"😓 name is not available" = "😓 name is not available";
"😢 PIN doesn't match. Please try again" = "😢 PIN doesn't match. Please try again";
"Confirm selection" = "Confirm selection";
"The token %@ is out of the strict list" = "The token %@ is out of the strict list";
"Make sure the mint address %@ is correct before confirming" = "Make sure the mint address %@ is correct before confirming";
"Be save and carefull" = "Be save and carefull";
"The token %@ from your swap link seems suspicious, therefore we've refreshed swap pair to default." = "The token %@ from your swap link seems suspicious, therefore we've refreshed swap pair to default.";
"Charge that you need to pay to send or receive tokens-2022. It helps maintain the network and ensure smooth transactions." = "Charge that you need to pay to send or receive tokens-2022. It helps maintain the network and ensure smooth transactions.";
"Confirm selection" = "Confirm selection";
"The token %@ is out of the strict list" = "The token %@ is out of the strict list";
"Make sure the mint address %@ is correct before confirming" = "Make sure the mint address %@ is correct before confirming";
"Unfortunately, you can not cashout in %@, but you can still use other Key App features" = "Unfortunately, you can not cashout in %@, but you can still use other Key App features";
"Share my link" = "Share my link";
"Open details" = "Open details";
"Token 2022 details" = "Token 2022 details";
"Calculated by subtracting the token 2022 transfer fee from your balance" = "Calculated by subtracting the token 2022 transfer fee from your balance";
"Calculated by subtracting the token 2022 transfer fee and account creation fee from your balance" = "Calculated by subtracting the token 2022 transfer fee and account creation fee from your balance";
"Update available" = "Update available";
"Referral program" = "Referral program";
"%@ all the time" = "%@ all the time";
"Here’s how do we count your profits for total balance and every single token" = "Here’s how do we count your profits for total balance and every single token";
"Based on absolute and relative profitability of each trade. It shows the relative potential %% profits or losses of your trading strategy." = "Based on absolute and relative profitability of each trade. It shows the relative potential %% profits or losses of your trading strategy.";
"%@%% last 24h" = "%@%% last 24h";
"Result of an investment, trading strategy per 24 hours" = "Result of an investment, trading strategy per 24 hours";
"Referral reward" = "Referral reward";
"Open SOLScan" = "Open SOLScan";
"Terms & Conditions" = "Terms & Conditions";
"Swap fee" = "Swap fee";
"Token-2022 transfer fee" = "Token-2022 transfer fee";
"Solscan" = "Solscan";
2 changes: 1 addition & 1 deletion project.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ configFiles:

settings:
base:
MARKETING_VERSION: 2.11.1
MARKETING_VERSION: 2.12.0
configs:
Debug:
VALIDATE_PRODUCT: false
Expand Down

0 comments on commit 8bcb3fa

Please sign in to comment.