Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Satscard Integration (Android) #26

Merged
merged 17 commits into from
Dec 11, 2023
Merged

Satscard Integration (Android) #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1b3a8a7
Add some Satscard prompt strings
PeteClubSeven Nov 6, 2023
6e26b75
Add strings for InitializeSatscardPage
PeteClubSeven Nov 10, 2023
c3ba596
Add more Satscard strings
PeteClubSeven Nov 20, 2023
21d9560
Strings for Satscard balance page
PeteClubSeven Nov 24, 2023
c9a26ad
Add a warning when there's no Satscard balance
PeteClubSeven Nov 25, 2023
c88f5d9
Add strings for SweepSlotPage
PeteClubSeven Nov 25, 2023
0fa484d
Add error reporting for SweepSlotPage
PeteClubSeven Nov 27, 2023
4eae23a
Add strings for the BroadcastSlotSweepTransactionPage
PeteClubSeven Nov 30, 2023
0f67823
Make tweaks requested by Breez
PeteClubSeven Dec 1, 2023
5f6cd11
Add strings for new Satscard dialogs
PeteClubSeven Dec 2, 2023
319dd20
Adjust some Satscard strings
PeteClubSeven Dec 6, 2023
b97e256
Add Satscard strings to non-English languages
PeteClubSeven Dec 6, 2023
312b0c8
Add tests for Satscard strings
PeteClubSeven Dec 6, 2023
60e316b
Fix default locale in generated files
PeteClubSeven Dec 6, 2023
138c43e
Modify Satscard strings at Roys request
PeteClubSeven Dec 6, 2023
a2dfbd2
Replace other usage of "phone" with "device"
PeteClubSeven Dec 7, 2023
d4b6063
Add dialog title for the successful sweep dialog
PeteClubSeven Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions l10n.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ template-arb-file: app_en.arb
output-localization-file: breez_translations.dart
output-class: BreezTranslations
output-dir: lib/generated
preferred-supported-locales: ["en"]
ademar111190 marked this conversation as resolved.
Show resolved Hide resolved
synthetic-package: false
untranslated-messages-file: untranslated_messages.txt
105 changes: 105 additions & 0 deletions lib/app_bg.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@
},
"invoice_btc_address_deposit_address": "Депозитен адрес",
"invoice_btc_address_deposit_address_copied": "Адресът за депозит бе копиран в клипборда ви.",
"invoice_btc_address_generic_address": "BTC Address",
"invoice_btc_address_generic_address_copied": "BTC address was copied to your clipboard.",
"invoice_btc_address_on_chain_begin": "Breez използва метода Submarine Swaps за извършване на транзакции във веригата. Кликнете ",
"invoice_btc_address_on_chain_here": "тук",
"invoice_btc_address_on_chain_end": " за да видите скрипта, асоцииран с този адрес.",
Expand Down Expand Up @@ -2350,6 +2352,109 @@
"setup_fees_dialog_title": "Такси за настройка",
"setup_fees_dialog_message": "Моля, обърнете внимание на актуализираните такси за отваряне на канал под QR кода, преди да получите плащане.",
"google_sign_not_available_exception": "Влизането в Google не е налично на това устройство.",
"satscard_dialog_ok": "OK",
"satscard_dialog_cancel": "CANCEL",
"satscard_error_invalid_title": "Unknown Error",
"satscard_error_invalid_body": "Communication with the Satscard failed unexpectedly:\n{error}",
"satscard_error_nfc_title": "Communication Error",
"satscard_error_nfc_body": "Communications with the Satscard failed or were interrupted, please try again.",
"satscard_error_used_up_title": "All Slots Are Unsealed",
"satscard_error_used_up_body": "A Satscard was detected but it had no sealed or unused slots and therefore can't be used.",
"satscard_unused_prompt_title": "Uninitialized Satscard Slot",
"satscard_unused_prompt_body": "The active slot of the detected Satscard needs to be initialized before it can be used",
"satscard_initialize_title": "Initialize Satscard Slot {number}",
"satscard_initialize_button_label": "INITIALIZE",
"satscard_card_id_text": "Card ID: {id}",
"satscard_card_id_copied": "Satscard ID was copied to your clipboard.",
"satscard_spend_code_label": "Spend code",
"satscard_spend_code_incorrect_code_hint": "The code you entered was incorrect",
"satscard_spend_code_incorrect_length_hint": "Look for a 6-digit code on the back of the card",
"satscard_chain_code_label": "Chain code (optional)",
"satscard_chain_code_wrong_hint": "Must be empty or a 32-byte hex string",
"satscard_balance_title": "Satscard Balance",
"satscard_balance_button_label": "SWEEP",
"satscard_balance_button_retry_label": "RETRY",
"satscard_balance_warning_no_funds_title": "No Balance",
"satscard_balance_warning_no_funds_body": "There is no confirmed balance on the Satscard slot so it can't be swept",
"satscard_balance_warning_unconfirmed_title": "Unconfirmed Balance",
"satscard_balance_warning_unconfirmed_body": "The slot has an unconfirmed balance, this will be ignored and only the confirmed balance will be swept",
"satscard_balance_awaiting_balance_label": "Retrieving slot balance",
"satscard_balance_awaiting_account_label": "Retrieving currency information",
"satscard_balance_address_label": "Address:",
"satscard_balance_confirmed_label": "Balance:",
"satscard_balance_unconfirmed_label": "Unconfirmed:",
"satscard_balance_value_no_fiat": "{received}",
"@satscard_balance_value_no_fiat": {
"placeholders": {
"received": {
"type": "String",
"example": "12 345"
}
}
},
"satscard_balance_value_with_fiat": "{received} ({fiat})",
"@satscard_balance_value_with_fiat": {
"placeholders": {
"received": {
"type": "String",
"example": "12 345"
},
"fiat": {
"type": "String",
"example": "56$"
}
}
},
"satscard_balance_birth_height_label": "Birth Block:",
"satscard_balance_card_id_label": "Card ID:",
"satscard_balance_slot_label": "Slot:",
"satscard_balance_version_label": "Version:",
"satscard_balance_error_address_info": "An error occurred while retrieving the balance of the Satscard slot:\n{error}",
"satscard_sweep_title": "Sweep Satscard Slot {number}",
"satscard_sweep_button_confirm_label": "CONFIRM",
"satscard_sweep_button_cancel_label": "CANCEL",
"satscard_sweep_balance_label": "Slot balance:",
"satscard_sweep_lsp_fee_label": "Setup fee:",
"satscard_sweep_chain_fee_label": "Transaction fee:",
"satscard_sweep_receive_label": "You receive:",
"satscard_sweep_balance_too_high_label": "Maximum deposit:",
"satscard_sweep_balance_too_low_label": "Minimum deposit:",
"satscard_sweep_reserve_not_met_label": "Required reserve:",
"satscard_sweep_fee_value": "-{fee}",
"@satscard_sweep_fee_value": {
"placeholders": {
"fee": {
"type": "String",
"example": "12 345"
}
}
},
"satscard_sweep_awaiting_fees_label": "Retrieving fee rates",
"satscard_sweep_awaiting_deposit_label": "Retrieving deposit address",
"satscard_sweep_awaiting_lsp_label": "Retrieving LSP status",
"satscard_sweep_warning_lsp_fee_no_liquidity_label": "A setup fee of {percent}% with a minimum fee of {minimum} is required to sweep the Satscard",
"satscard_sweep_warning_lsp_fee_label": "A setup fee of {percent}% with a minimum fee of {minimum} is required because the balance of the Satscard exceeds {sats}",
"satscard_sweep_warning_not_valid": "The Satscard slot can't be swept",
"satscard_sweep_error_deposit_address": "An error occurred while retrieving a deposit address:\n{error}",
"satscard_sweep_error_create_transactions": "An error occurred while retrieving a retrieving fees rates and constructing transactions:\n{error}",
"satscard_broadcast_title": "Broadcast Transaction",
"satscard_broadcast_signing_label": "Signing transaction",
"satscard_broadcast_broadcasting_label": "Broadcasting transaction",
"satscard_broadcast_error_signing": "An error occurred while attempting to sign the transaction before broadcast:\n{error}",
"satscard_broadcast_error_broadcasting": "An error occurred while attempting to broadcast the transaction before broadcast:\n{error}",
"satscard_broadcast_complete_title": "Satscard Swept",
"satscard_operation_dialog_title": "Scan Satscard",
"satscard_operation_dialog_cancel_label": "CANCEL",
"satscard_operation_dialog_present_satscards_label": "Please hold the Satscard with the following ID against your device:\n{id}",
"satscard_operation_dialog_success_label": "Operation complete",
"satscard_operation_dialog_in_progress_label": "Communicating with Satscard",
"satscard_operation_dialog_waiting_label": "An incorrect spend code was previously entered. Please keep the Satscard held against your device",
"satscard_operation_dialog_incorrect_card_label": "Incorrect card presented, the ID on the rear of the card must be:\n{id}",
"satscard_operation_dialog_incorrect_code_label": "Incorrect spend code",
"satscard_operation_dialog_stale_card_label": "The correct card was presented but it's in an unexpected state, it may have been modified outside of the app.",
"satscard_operation_dialog_nfc_error_label": "A communication error occurred, please try again.",
"satscard_operation_dialog_protocol_error_label": "Encountered protocol error {code}, {literal}:\n{message}",
"satscard_operation_dialog_unknown_error_label": "An error occurred:\n{message}",
"locale": "en",
"app_name": "Breez"
}
105 changes: 105 additions & 0 deletions lib/app_cs.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@
},
"invoice_btc_address_deposit_address": "Adresa vkladu",
"invoice_btc_address_deposit_address_copied": "Adresa vkladu byla zkopírována do vaší schránky.",
"invoice_btc_address_generic_address": "BTC Address",
"invoice_btc_address_generic_address_copied": "BTC address was copied to your clipboard.",
"invoice_btc_address_on_chain_begin": "Breez používá Submarine Swaps k provádění transakcí v řetězci. Klikněte na ",
"invoice_btc_address_on_chain_here": "zde",
"invoice_btc_address_on_chain_end": " pro zobrazení skriptu přidruženého k této adrese.",
Expand Down Expand Up @@ -2350,6 +2352,109 @@
"setup_fees_dialog_title": "Zřizovací poplatky",
"setup_fees_dialog_message": "Před přijetím platby si prosím všimněte aktualizovaných poplatků za nastavení pod QR kódem.",
"google_sign_not_available_exception": "Google Sign-In is not available on this device.",
"satscard_dialog_ok": "OK",
"satscard_dialog_cancel": "CANCEL",
"satscard_error_invalid_title": "Unknown Error",
"satscard_error_invalid_body": "Communication with the Satscard failed unexpectedly:\n{error}",
"satscard_error_nfc_title": "Communication Error",
"satscard_error_nfc_body": "Communications with the Satscard failed or were interrupted, please try again.",
"satscard_error_used_up_title": "All Slots Are Unsealed",
"satscard_error_used_up_body": "A Satscard was detected but it had no sealed or unused slots and therefore can't be used.",
"satscard_unused_prompt_title": "Uninitialized Satscard Slot",
"satscard_unused_prompt_body": "The active slot of the detected Satscard needs to be initialized before it can be used",
"satscard_initialize_title": "Initialize Satscard Slot {number}",
"satscard_initialize_button_label": "INITIALIZE",
"satscard_card_id_text": "Card ID: {id}",
"satscard_card_id_copied": "Satscard ID was copied to your clipboard.",
"satscard_spend_code_label": "Spend code",
"satscard_spend_code_incorrect_code_hint": "The code you entered was incorrect",
"satscard_spend_code_incorrect_length_hint": "Look for a 6-digit code on the back of the card",
"satscard_chain_code_label": "Chain code (optional)",
"satscard_chain_code_wrong_hint": "Must be empty or a 32-byte hex string",
"satscard_balance_title": "Satscard Balance",
"satscard_balance_button_label": "SWEEP",
"satscard_balance_button_retry_label": "RETRY",
"satscard_balance_warning_no_funds_title": "No Balance",
"satscard_balance_warning_no_funds_body": "There is no confirmed balance on the Satscard slot so it can't be swept",
"satscard_balance_warning_unconfirmed_title": "Unconfirmed Balance",
"satscard_balance_warning_unconfirmed_body": "The slot has an unconfirmed balance, this will be ignored and only the confirmed balance will be swept",
"satscard_balance_awaiting_balance_label": "Retrieving slot balance",
"satscard_balance_awaiting_account_label": "Retrieving currency information",
"satscard_balance_address_label": "Address:",
"satscard_balance_confirmed_label": "Balance:",
"satscard_balance_unconfirmed_label": "Unconfirmed:",
"satscard_balance_value_no_fiat": "{received}",
"@satscard_balance_value_no_fiat": {
"placeholders": {
"received": {
"type": "String",
"example": "12 345"
}
}
},
"satscard_balance_value_with_fiat": "{received} ({fiat})",
"@satscard_balance_value_with_fiat": {
"placeholders": {
"received": {
"type": "String",
"example": "12 345"
},
"fiat": {
"type": "String",
"example": "56$"
}
}
},
"satscard_balance_birth_height_label": "Birth Block:",
"satscard_balance_card_id_label": "Card ID:",
"satscard_balance_slot_label": "Slot:",
"satscard_balance_version_label": "Version:",
"satscard_balance_error_address_info": "An error occurred while retrieving the balance of the Satscard slot:\n{error}",
"satscard_sweep_title": "Sweep Satscard Slot {number}",
"satscard_sweep_button_confirm_label": "CONFIRM",
"satscard_sweep_button_cancel_label": "CANCEL",
"satscard_sweep_balance_label": "Slot balance:",
"satscard_sweep_lsp_fee_label": "Setup fee:",
"satscard_sweep_chain_fee_label": "Transaction fee:",
"satscard_sweep_receive_label": "You receive:",
"satscard_sweep_balance_too_high_label": "Maximum deposit:",
"satscard_sweep_balance_too_low_label": "Minimum deposit:",
"satscard_sweep_reserve_not_met_label": "Required reserve:",
"satscard_sweep_fee_value": "-{fee}",
"@satscard_sweep_fee_value": {
"placeholders": {
"fee": {
"type": "String",
"example": "12 345"
}
}
},
"satscard_sweep_awaiting_fees_label": "Retrieving fee rates",
"satscard_sweep_awaiting_deposit_label": "Retrieving deposit address",
"satscard_sweep_awaiting_lsp_label": "Retrieving LSP status",
"satscard_sweep_warning_lsp_fee_no_liquidity_label": "A setup fee of {percent}% with a minimum fee of {minimum} is required to sweep the Satscard",
"satscard_sweep_warning_lsp_fee_label": "A setup fee of {percent}% with a minimum fee of {minimum} is required because the balance of the Satscard exceeds {sats}",
"satscard_sweep_warning_not_valid": "The Satscard slot can't be swept",
"satscard_sweep_error_deposit_address": "An error occurred while retrieving a deposit address:\n{error}",
"satscard_sweep_error_create_transactions": "An error occurred while retrieving a retrieving fees rates and constructing transactions:\n{error}",
"satscard_broadcast_title": "Broadcast Transaction",
"satscard_broadcast_signing_label": "Signing transaction",
"satscard_broadcast_broadcasting_label": "Broadcasting transaction",
"satscard_broadcast_error_signing": "An error occurred while attempting to sign the transaction before broadcast:\n{error}",
"satscard_broadcast_error_broadcasting": "An error occurred while attempting to broadcast the transaction before broadcast:\n{error}",
"satscard_broadcast_complete_title": "Satscard Swept",
"satscard_operation_dialog_title": "Scan Satscard",
"satscard_operation_dialog_cancel_label": "CANCEL",
"satscard_operation_dialog_present_satscards_label": "Please hold the Satscard with the following ID against your device:\n{id}",
"satscard_operation_dialog_success_label": "Operation complete",
"satscard_operation_dialog_in_progress_label": "Communicating with Satscard",
"satscard_operation_dialog_waiting_label": "An incorrect spend code was previously entered. Please keep the Satscard held against your device",
"satscard_operation_dialog_incorrect_card_label": "Incorrect card presented, the ID on the rear of the card must be:\n{id}",
"satscard_operation_dialog_incorrect_code_label": "Incorrect spend code",
"satscard_operation_dialog_stale_card_label": "The correct card was presented but it's in an unexpected state, it may have been modified outside of the app.",
"satscard_operation_dialog_nfc_error_label": "A communication error occurred, please try again.",
"satscard_operation_dialog_protocol_error_label": "Encountered protocol error {code}, {literal}:\n{message}",
"satscard_operation_dialog_unknown_error_label": "An error occurred:\n{message}",
"locale": "cz",
"app_name": "Breez"
}
Loading