Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge remote-tracking branch 'origin/frontend' into develop

Browse source
This commit is contained in:
wildkif 2019-05-29 20:31:12 +03:00
commit deb4620319
2 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/gui/qt-daemon/html/assets/i18n/en.json
View file

@ -261,7 +261,7 @@
"DETAILS": "Additional details", "DETAILS": "Additional details",
"MIXIN": "Mixin", "MIXIN": "Mixin",
"FEE": "Fee", "FEE": "Fee",
"HIDE": "Hide your wallet address from receiver", "HIDE": "Hide your wallet address from recipient",
"BUTTON": "Send", "BUTTON": "Send",
"SUCCESS_SENT": "Transaction sent", "SUCCESS_SENT": "Transaction sent",
"FORM_ERRORS": { "FORM_ERRORS": {
@ -306,13 +306,13 @@
"POS_REWARD": "POS reward", "POS_REWARD": "POS reward",
"CREATE_CONTRACT": "Contract proposal", "CREATE_CONTRACT": "Contract proposal",
"PLEDGE_CONTRACT": "Contract deposit", "PLEDGE_CONTRACT": "Contract deposit",
"NULLIFY_CONTRACT": "Burn deposits for contract", "NULLIFY_CONTRACT": "Burn deposits",
"PROPOSAL_CANCEL_CONTRACT": "Cancellation request", "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
"CANCEL_CONTRACT": "Cancel contract and return deposits" "CANCEL_CONTRACT": "Cancel and return deposits"
} }
}, },
"CONTRACTS": { "CONTRACTS": {
"EMPTY": "No active contracts.", "EMPTY": "No active contracts",
"CONTRACTS": "Contracts", "CONTRACTS": "Contracts",
"PURCHASE": "Purchase", "PURCHASE": "Purchase",
"SELL": "Sell", "SELL": "Sell",
@ -324,40 +324,40 @@
"LISTING_BUTTON": "Create listing", "LISTING_BUTTON": "Create listing",
"TIME_LEFT": { "TIME_LEFT": {
"REMAINING_LESS_ONE": "Less than an hour to respond", "REMAINING_LESS_ONE": "Less than an hour to respond",
"REMAINING_ONE": "{{time}} hour remain", "REMAINING_ONE": "{{time}} hour remains",
"REMAINING_MANY": "{{time}} hours remain", "REMAINING_MANY": "{{time}} hours remain",
"REMAINING_MANY_ALT": "{{time}} hours remain", "REMAINING_MANY_ALT": "{{time}} hours remain",
"REMAINING_ONE_RESPONSE": "{{time}} hour remain", "REMAINING_ONE_RESPONSE": "{{time}} hour remains",
"REMAINING_MANY_RESPONSE": "{{time}} hours remain", "REMAINING_MANY_RESPONSE": "{{time}} hours remain",
"REMAINING_MANY_ALT_RESPONSE": "{{time}} hours remain", "REMAINING_MANY_ALT_RESPONSE": "{{time}} hours remain",
"REMAINING_ONE_WAITING": "Remaining {{time}} hour waiting", "REMAINING_ONE_WAITING": "Waiting for {{time}} hour",
"REMAINING_MANY_WAITING": "Remaining {{time}} hours waiting", "REMAINING_MANY_WAITING": "Waiting for {{time}} hours",
"REMAINING_MANY_ALT_WAITING": "Remaining {{time}} hours waiting" "REMAINING_MANY_ALT_WAITING": "Waiting for {{time}} hours"
}, },
"STATUS_MESSAGES": { "STATUS_MESSAGES": {
"SELLER": { "SELLER": {
"NEW_CONTRACT": "New contract proposal", "NEW_CONTRACT": "New contract proposal",
"IGNORED": "You ignored the contract proposal", "IGNORED": "You ignored contract proposal",
"ACCEPTED": "Contract started", "ACCEPTED": "Contract started",
"WAIT": "Waiting for contract confirmation", "WAIT": "Waiting for contract confirmation",
"WAITING_BUYER": "Waiting for delivery", "WAITING_BUYER": "Waiting for delivery",
"COMPLETED": "Contract completed", "COMPLETED": "Contract completed",
"NOT_RECEIVED": "Item not received", "NOT_RECEIVED": "Delivery failed",
"NULLIFIED": "All deposits burned", "NULLIFIED": "All deposits burned",
"PROPOSAL_CANCEL": "New proposal to cancel contract and return pledges", "PROPOSAL_CANCEL": "New proposal to cancel contract and return deposits",
"BEING_CANCELLED": "Cancellation in progress", "BEING_CANCELLED": "Cancellation in progress",
"CANCELLED": "Contract canceled", "CANCELLED": "Contract canceled",
"IGNORED_CANCEL": "You ignored the proposal to cancel the contract", "IGNORED_CANCEL": "You ignored cancellation proposal",
"EXPIRED": "The contract proposal has expired" "EXPIRED": "Contract proposal has expired"
}, },
"BUYER": { "BUYER": {
"WAITING": "Waiting for response", "WAITING": "Waiting for response",
"IGNORED": "The seller ignored your contract proposal", "IGNORED": "Seller ignored your contract proposal",
"ACCEPTED": "The seller accepted your contract proposal", "ACCEPTED": "Seller accepted your contract proposal",
"WAIT": "Waiting for deposits confirmation", "WAIT": "Waiting for deposits confirmation",
"WAITING_SELLER": "Waiting for delivery", "WAITING_SELLER": "Waiting for delivery",
"COMPLETED": "Contract completed", "COMPLETED": "Contract completed",
"NOT_RECEIVED": "Item not received", "NOT_RECEIVED": "Delivery failed",
"NULLIFIED": "All deposits burned", "NULLIFIED": "All deposits burned",
"WAITING_CANCEL": "Waiting for contract cancellation", "WAITING_CANCEL": "Waiting for contract cancellation",
"BEING_CANCELLED": "Cancellation in progress", "BEING_CANCELLED": "Cancellation in progress",
@ -379,16 +379,16 @@
"DETAILS": "Additional details", "DETAILS": "Additional details",
"SEND_BUTTON": "Send", "SEND_BUTTON": "Send",
"FORM_ERRORS": { "FORM_ERRORS": {
"DESC_REQUIRED": "Description is required", "DESC_REQUIRED": "Description required",
"DESC_MAXIMUM": "Maximum field length reached", "DESC_MAXIMUM": "Maximum field length reached",
"SELLER_REQUIRED": "Address required", "SELLER_REQUIRED": "Address required",
"SELLER_NOT_VALID": "Invalid address", "SELLER_NOT_VALID": "Invalid address",
"ALIAS_NOT_VALID": "Alias not valid", "ALIAS_NOT_VALID": "Invalid alias",
"AMOUNT_REQUIRED": "Amount is required", "AMOUNT_REQUIRED": "Amount required",
"AMOUNT_ZERO": "Amount cannot be zero", "AMOUNT_ZERO": "Amount cannot be zero",
"YOUR_DEPOSIT_REQUIRED": "Deposit required", "YOUR_DEPOSIT_REQUIRED": "Deposit required",
"SELLER_DEPOSIT_REQUIRED": "Seller deposit is required", "SELLER_DEPOSIT_REQUIRED": "Seller deposit required",
"SELLER_SAME": "The seller's and buyer's accounts are identical. The seller and buyer must use different wallet for the contract", "SELLER_SAME": "Use separate account",
"COMMENT_MAXIMUM": "Maximum field length reached" "COMMENT_MAXIMUM": "Maximum field length reached"
}, },
"PROGRESS_NEW": "New purchase", "PROGRESS_NEW": "New purchase",
@ -410,21 +410,21 @@
"PROPOSAL_CANCEL_BUYER": "Cancellation request received", "PROPOSAL_CANCEL_BUYER": "Cancellation request received",
"BEING_CANCELLED": "Cancellation in progress", "BEING_CANCELLED": "Cancellation in progress",
"IGNORED_CANCEL_SELLER": "The seller ignored your proposal to cancel the contract", "IGNORED_CANCEL_SELLER": "The seller ignored your proposal to cancel the contract",
"IGNORED_CANCEL_BUYER": "You ignored the proposal to cancel the contract", "IGNORED_CANCEL_BUYER": "Contract cancellation proposal ignored",
"CANCELLED": "Contract canceled", "CANCELLED": "Contract canceled",
"EXPIRED": "The contract proposal has expired", "EXPIRED": "Contract proposal expired",
"NOT_RECEIVED": "Item not received", "NOT_RECEIVED": "Delivery failed",
"NULLIFIED": "All deposits burned" "NULLIFIED": "All deposits burned"
}, },
"ACCEPT_STATE_WAIT_BIG": "Contract started", "ACCEPT_STATE_WAIT_BIG": "Contract started",
"IGNORED_ACCEPT": "Contract proposal ignored", "IGNORED_ACCEPT": "Contract proposal ignored",
"BURN_PROPOSAL": "The deposits have been voided", "BURN_PROPOSAL": "Deposits burned",
"SUCCESS_FINISH_PROPOSAL": "Contract completed", "SUCCESS_FINISH_PROPOSAL": "Contract completed",
"SEND_CANCEL_PROPOSAL": "Cancellation request sent", "SEND_CANCEL_PROPOSAL": "Cancellation request sent",
"IGNORED_CANCEL": "You have ignored the proposal to cancel the contract", "IGNORED_CANCEL": "Contract cancellation proposal ignored",
"DEALS_CANCELED_WAIT": "Cancellation in progress", "DEALS_CANCELED_WAIT": "Cancellation in progress",
"WAITING_TIME": "Response time", "WAITING_TIME": "Response time",
"NEED_MONEY": "There are insufficient funds in the wallet. Add funds to the wallet to continue", "NEED_MONEY": "Insufficient funds",
"BUTTON_MAKE_PLEDGE": "Accept and make deposit", "BUTTON_MAKE_PLEDGE": "Accept and make deposit",
"BUTTON_IGNORE": "Ignore and hide offer", "BUTTON_IGNORE": "Ignore and hide offer",
"BUTTON_NULLIFY": "Terminate and burn deposits", "BUTTON_NULLIFY": "Terminate and burn deposits",
@ -479,7 +479,7 @@
"ERRORS": { "ERRORS": {
"NO_MONEY": "Not enough money", "NO_MONEY": "Not enough money",
"NOT_ENOUGH_MONEY": "Insufficient funds in account", "NOT_ENOUGH_MONEY": "Insufficient funds in account",
"CORE_BUSY": "Internal error (core is busy)", "CORE_BUSY": "Internal error: core is busy",
"DAEMON_BUSY": "Internal error: daemon is busy", "DAEMON_BUSY": "Internal error: daemon is busy",
"NO_MONEY_REMOVE_OFFER": "There is no fee for deleting an offer, but in order to protect the network against flood transactions you need to have at least {{fee}} {{currency}} in your wallet", "NO_MONEY_REMOVE_OFFER": "There is no fee for deleting an offer, but in order to protect the network against flood transactions you need to have at least {{fee}} {{currency}} in your wallet",
"NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with", "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",

58
src/gui/qt-daemon/html_source/src/assets/i18n/en.json
View file

@ -261,7 +261,7 @@
"DETAILS": "Additional details", "DETAILS": "Additional details",
"MIXIN": "Mixin", "MIXIN": "Mixin",
"FEE": "Fee", "FEE": "Fee",
"HIDE": "Hide your wallet address from receiver", "HIDE": "Hide your wallet address from recipient",
"BUTTON": "Send", "BUTTON": "Send",
"SUCCESS_SENT": "Transaction sent", "SUCCESS_SENT": "Transaction sent",
"FORM_ERRORS": { "FORM_ERRORS": {
@ -306,13 +306,13 @@
"POS_REWARD": "POS reward", "POS_REWARD": "POS reward",
"CREATE_CONTRACT": "Contract proposal", "CREATE_CONTRACT": "Contract proposal",
"PLEDGE_CONTRACT": "Contract deposit", "PLEDGE_CONTRACT": "Contract deposit",
"NULLIFY_CONTRACT": "Burn deposits for contract", "NULLIFY_CONTRACT": "Burn deposits",
"PROPOSAL_CANCEL_CONTRACT": "Cancellation request", "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
"CANCEL_CONTRACT": "Cancel contract and return deposits" "CANCEL_CONTRACT": "Cancel and return deposits"
} }
}, },
"CONTRACTS": { "CONTRACTS": {
"EMPTY": "No active contracts.", "EMPTY": "No active contracts",
"CONTRACTS": "Contracts", "CONTRACTS": "Contracts",
"PURCHASE": "Purchase", "PURCHASE": "Purchase",
"SELL": "Sell", "SELL": "Sell",
@ -324,40 +324,40 @@
"LISTING_BUTTON": "Create listing", "LISTING_BUTTON": "Create listing",
"TIME_LEFT": { "TIME_LEFT": {
"REMAINING_LESS_ONE": "Less than an hour to respond", "REMAINING_LESS_ONE": "Less than an hour to respond",
"REMAINING_ONE": "{{time}} hour remain", "REMAINING_ONE": "{{time}} hour remains",
"REMAINING_MANY": "{{time}} hours remain", "REMAINING_MANY": "{{time}} hours remain",
"REMAINING_MANY_ALT": "{{time}} hours remain", "REMAINING_MANY_ALT": "{{time}} hours remain",
"REMAINING_ONE_RESPONSE": "{{time}} hour remain", "REMAINING_ONE_RESPONSE": "{{time}} hour remains",
"REMAINING_MANY_RESPONSE": "{{time}} hours remain", "REMAINING_MANY_RESPONSE": "{{time}} hours remain",
"REMAINING_MANY_ALT_RESPONSE": "{{time}} hours remain", "REMAINING_MANY_ALT_RESPONSE": "{{time}} hours remain",
"REMAINING_ONE_WAITING": "Remaining {{time}} hour waiting", "REMAINING_ONE_WAITING": "Waiting for {{time}} hour",
"REMAINING_MANY_WAITING": "Remaining {{time}} hours waiting", "REMAINING_MANY_WAITING": "Waiting for {{time}} hours",
"REMAINING_MANY_ALT_WAITING": "Remaining {{time}} hours waiting" "REMAINING_MANY_ALT_WAITING": "Waiting for {{time}} hours"
}, },
"STATUS_MESSAGES": { "STATUS_MESSAGES": {
"SELLER": { "SELLER": {
"NEW_CONTRACT": "New contract proposal", "NEW_CONTRACT": "New contract proposal",
"IGNORED": "You ignored the contract proposal", "IGNORED": "You ignored contract proposal",
"ACCEPTED": "Contract started", "ACCEPTED": "Contract started",
"WAIT": "Waiting for contract confirmation", "WAIT": "Waiting for contract confirmation",
"WAITING_BUYER": "Waiting for delivery", "WAITING_BUYER": "Waiting for delivery",
"COMPLETED": "Contract completed", "COMPLETED": "Contract completed",
"NOT_RECEIVED": "Item not received", "NOT_RECEIVED": "Delivery failed",
"NULLIFIED": "All deposits burned", "NULLIFIED": "All deposits burned",
"PROPOSAL_CANCEL": "New proposal to cancel contract and return pledges", "PROPOSAL_CANCEL": "New proposal to cancel contract and return deposits",
"BEING_CANCELLED": "Cancellation in progress", "BEING_CANCELLED": "Cancellation in progress",
"CANCELLED": "Contract canceled", "CANCELLED": "Contract canceled",
"IGNORED_CANCEL": "You ignored the proposal to cancel the contract", "IGNORED_CANCEL": "You ignored cancellation proposal",
"EXPIRED": "The contract proposal has expired" "EXPIRED": "Contract proposal has expired"
}, },
"BUYER": { "BUYER": {
"WAITING": "Waiting for response", "WAITING": "Waiting for response",
"IGNORED": "The seller ignored your contract proposal", "IGNORED": "Seller ignored your contract proposal",
"ACCEPTED": "The seller accepted your contract proposal", "ACCEPTED": "Seller accepted your contract proposal",
"WAIT": "Waiting for deposits confirmation", "WAIT": "Waiting for deposits confirmation",
"WAITING_SELLER": "Waiting for delivery", "WAITING_SELLER": "Waiting for delivery",
"COMPLETED": "Contract completed", "COMPLETED": "Contract completed",
"NOT_RECEIVED": "Item not received", "NOT_RECEIVED": "Delivery failed",
"NULLIFIED": "All deposits burned", "NULLIFIED": "All deposits burned",
"WAITING_CANCEL": "Waiting for contract cancellation", "WAITING_CANCEL": "Waiting for contract cancellation",
"BEING_CANCELLED": "Cancellation in progress", "BEING_CANCELLED": "Cancellation in progress",
@ -379,16 +379,16 @@
"DETAILS": "Additional details", "DETAILS": "Additional details",
"SEND_BUTTON": "Send", "SEND_BUTTON": "Send",
"FORM_ERRORS": { "FORM_ERRORS": {
"DESC_REQUIRED": "Description is required", "DESC_REQUIRED": "Description required",
"DESC_MAXIMUM": "Maximum field length reached", "DESC_MAXIMUM": "Maximum field length reached",
"SELLER_REQUIRED": "Address required", "SELLER_REQUIRED": "Address required",
"SELLER_NOT_VALID": "Invalid address", "SELLER_NOT_VALID": "Invalid address",
"ALIAS_NOT_VALID": "Alias not valid", "ALIAS_NOT_VALID": "Invalid alias",
"AMOUNT_REQUIRED": "Amount is required", "AMOUNT_REQUIRED": "Amount required",
"AMOUNT_ZERO": "Amount cannot be zero", "AMOUNT_ZERO": "Amount cannot be zero",
"YOUR_DEPOSIT_REQUIRED": "Deposit required", "YOUR_DEPOSIT_REQUIRED": "Deposit required",
"SELLER_DEPOSIT_REQUIRED": "Seller deposit is required", "SELLER_DEPOSIT_REQUIRED": "Seller deposit required",
"SELLER_SAME": "The seller's and buyer's accounts are identical. The seller and buyer must use different wallet for the contract", "SELLER_SAME": "Use separate account",
"COMMENT_MAXIMUM": "Maximum field length reached" "COMMENT_MAXIMUM": "Maximum field length reached"
}, },
"PROGRESS_NEW": "New purchase", "PROGRESS_NEW": "New purchase",
@ -410,21 +410,21 @@
"PROPOSAL_CANCEL_BUYER": "Cancellation request received", "PROPOSAL_CANCEL_BUYER": "Cancellation request received",
"BEING_CANCELLED": "Cancellation in progress", "BEING_CANCELLED": "Cancellation in progress",
"IGNORED_CANCEL_SELLER": "The seller ignored your proposal to cancel the contract", "IGNORED_CANCEL_SELLER": "The seller ignored your proposal to cancel the contract",
"IGNORED_CANCEL_BUYER": "You ignored the proposal to cancel the contract", "IGNORED_CANCEL_BUYER": "Contract cancellation proposal ignored",
"CANCELLED": "Contract canceled", "CANCELLED": "Contract canceled",
"EXPIRED": "The contract proposal has expired", "EXPIRED": "Contract proposal expired",
"NOT_RECEIVED": "Item not received", "NOT_RECEIVED": "Delivery failed",
"NULLIFIED": "All deposits burned" "NULLIFIED": "All deposits burned"
}, },
"ACCEPT_STATE_WAIT_BIG": "Contract started", "ACCEPT_STATE_WAIT_BIG": "Contract started",
"IGNORED_ACCEPT": "Contract proposal ignored", "IGNORED_ACCEPT": "Contract proposal ignored",
"BURN_PROPOSAL": "The deposits have been voided", "BURN_PROPOSAL": "Deposits burned",
"SUCCESS_FINISH_PROPOSAL": "Contract completed", "SUCCESS_FINISH_PROPOSAL": "Contract completed",
"SEND_CANCEL_PROPOSAL": "Cancellation request sent", "SEND_CANCEL_PROPOSAL": "Cancellation request sent",
"IGNORED_CANCEL": "You have ignored the proposal to cancel the contract", "IGNORED_CANCEL": "Contract cancellation proposal ignored",
"DEALS_CANCELED_WAIT": "Cancellation in progress", "DEALS_CANCELED_WAIT": "Cancellation in progress",
"WAITING_TIME": "Response time", "WAITING_TIME": "Response time",
"NEED_MONEY": "There are insufficient funds in the wallet. Add funds to the wallet to continue", "NEED_MONEY": "Insufficient funds",
"BUTTON_MAKE_PLEDGE": "Accept and make deposit", "BUTTON_MAKE_PLEDGE": "Accept and make deposit",
"BUTTON_IGNORE": "Ignore and hide offer", "BUTTON_IGNORE": "Ignore and hide offer",
"BUTTON_NULLIFY": "Terminate and burn deposits", "BUTTON_NULLIFY": "Terminate and burn deposits",
@ -479,7 +479,7 @@
"ERRORS": { "ERRORS": {
"NO_MONEY": "Not enough money", "NO_MONEY": "Not enough money",
"NOT_ENOUGH_MONEY": "Insufficient funds in account", "NOT_ENOUGH_MONEY": "Insufficient funds in account",
"CORE_BUSY": "Internal error (core is busy)", "CORE_BUSY": "Internal error: core is busy",
"DAEMON_BUSY": "Internal error: daemon is busy", "DAEMON_BUSY": "Internal error: daemon is busy",
"NO_MONEY_REMOVE_OFFER": "There is no fee for deleting an offer, but in order to protect the network against flood transactions you need to have at least {{fee}} {{currency}} in your wallet", "NO_MONEY_REMOVE_OFFER": "There is no fee for deleting an offer, but in order to protect the network against flood transactions you need to have at least {{fee}} {{currency}} in your wallet",
"NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with", "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",