Merge pull request #2620 from cmgustavo/bug/spinner-send-broadcast
Bug/spinner send broadcast
This commit is contained in:
Matias Alejo Garcia
commit
a487c053d4
13 changed files with 173 additions and 197 deletions
157
po/es.po
157
po/es.po
|
|
@ -48,12 +48,12 @@ msgstr "Dirección"
|
|||
msgid "Alternative Currency"
|
||||
msgstr "Moneda Alternativa"
|
||||
|
||||
#: public/views/paymentUri.html public/views/send.html
|
||||
#: public/views/paymentUri.html public/views/walletHome.html
|
||||
#: public/views/modals/txp-details.html
|
||||
msgid "Amount"
|
||||
msgstr "Importe"
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Amount in"
|
||||
msgstr "Importe en"
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ msgstr "Importe en"
|
|||
msgid "Applying changes"
|
||||
msgstr "Aplicando los cambios"
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Available Balance"
|
||||
msgstr "Balance disponible"
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ msgstr "Volver"
|
|||
msgid "Backup"
|
||||
msgstr "Copia de seguridad"
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Backup now"
|
||||
msgstr "Copia de seguridad"
|
||||
|
||||
|
|
@ -81,7 +81,7 @@ msgstr "Copia de seguridad"
|
|||
msgid "Backup options"
|
||||
msgstr "Opciones de copia de seguridad"
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid ""
|
||||
"Before receiving funds, it is highly recommended you backup your wallet keys."
|
||||
msgstr ""
|
||||
|
|
@ -92,7 +92,7 @@ msgstr ""
|
|||
msgid "Bitcoin URI is NOT valid!"
|
||||
msgstr "¡Bitcoin URI no es válida!"
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Bitcoin address"
|
||||
msgstr "Dirección bitcoin"
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ msgstr "Pero no transmitida. Inténtelo manualmente"
|
|||
msgid "CANCEL"
|
||||
msgstr "CANCELAR"
|
||||
|
||||
#: public/views/copayers.html public/views/send.html
|
||||
#: public/views/copayers.html public/views/walletHome.html
|
||||
#: public/views/modals/confirmation.html
|
||||
msgid "Cancel"
|
||||
msgstr "Cancelar"
|
||||
|
|
@ -125,9 +125,9 @@ msgstr "Certificado por"
|
|||
msgid "Choose backup file from your computer"
|
||||
msgstr "Seleccione el archivo backup de su computadora"
|
||||
|
||||
#: public/views/modals/copayers.html public/views/modals/paypro.html
|
||||
#: public/views/modals/scanner.html public/views/modals/tx-details.html
|
||||
#: public/views/modals/txp-details.html
|
||||
#: public/views/includes/topbar.html public/views/modals/copayers.html
|
||||
#: public/views/modals/paypro.html public/views/modals/scanner.html
|
||||
#: public/views/modals/tx-details.html public/views/modals/txp-details.html
|
||||
msgid "Close"
|
||||
msgstr "Cerrar"
|
||||
|
||||
|
|
@ -141,7 +141,7 @@ msgstr "Confirmaciones"
|
|||
|
||||
#: public/views/modals/copayers.html
|
||||
msgid "Copayers"
|
||||
msgstr "Compañeros"
|
||||
msgstr "Copayers"
|
||||
|
||||
#: public/views/backup.html
|
||||
msgid "Copy backup in a safe place"
|
||||
|
|
@ -156,11 +156,7 @@ msgstr ""
|
|||
msgid "Copy to clipboard"
|
||||
msgstr "Copiar al portapapeles"
|
||||
|
||||
#: public/views/includes/offline.html
|
||||
msgid "Could not connect to Wallet Service"
|
||||
msgstr "No se pudo conectar a Wallet Service"
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Could not fetch transaction history"
|
||||
msgstr "No se pudo obtener el historial de transacciones"
|
||||
|
||||
|
|
@ -185,8 +181,8 @@ msgid "Created by"
|
|||
msgstr "Creado por"
|
||||
|
||||
#: public/views/create.html public/views/createProfile.html
|
||||
msgid "Creating wallet..."
|
||||
msgstr "Creando monedero..."
|
||||
msgid "Creating Wallet..."
|
||||
msgstr "Creando Monedero..."
|
||||
|
||||
#: public/views/modals/tx-details.html
|
||||
msgid "Date"
|
||||
|
|
@ -220,18 +216,10 @@ msgstr "Expira"
|
|||
msgid "Family vacation funds"
|
||||
msgstr "Fondos para vacaciones en familia"
|
||||
|
||||
#: public/views/send.html
|
||||
msgid "Fetching Payment Information..."
|
||||
msgstr "Buscando información del pago"
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Generate new address"
|
||||
msgstr "Generar nueva dirección"
|
||||
|
||||
#: public/views/history.html
|
||||
msgid "Getting transactions..."
|
||||
msgstr "Cargando transacciones..."
|
||||
|
||||
#: public/views/preferences.html
|
||||
msgid "Global settings"
|
||||
msgstr "Opciones globales"
|
||||
|
|
@ -289,8 +277,8 @@ msgid "Join shared wallet"
|
|||
msgstr "Unirse a un monedero"
|
||||
|
||||
#: public/views/join.html
|
||||
msgid "Joining shared wallet..."
|
||||
msgstr "Unirse a un monedero..."
|
||||
msgid "Joining Wallet..."
|
||||
msgstr "Uniéndose al Monedero..."
|
||||
|
||||
#: public/views/preferences.html
|
||||
msgid "Language"
|
||||
|
|
@ -300,6 +288,10 @@ msgstr "Idioma"
|
|||
msgid "Learn more about Wallet Migration"
|
||||
msgstr "Más detalles para migrar Monedero"
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Loading..."
|
||||
msgstr "Cargando..."
|
||||
|
||||
#: public/views/paymentUri.html
|
||||
msgid "Make a payment to"
|
||||
msgstr "Hacer un pago a"
|
||||
|
|
@ -320,11 +312,11 @@ msgstr "Mensaje del negocio"
|
|||
msgid "Message"
|
||||
msgstr "Mensaje"
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "More"
|
||||
msgstr "Más"
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Moved"
|
||||
msgstr "Movido"
|
||||
|
||||
|
|
@ -332,23 +324,27 @@ msgstr "Movido"
|
|||
msgid "Multisignature wallet"
|
||||
msgstr "Monedero multifirma"
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "My Bitcoin address"
|
||||
msgstr "Mi dirección Bitcoin"
|
||||
|
||||
#: public/views/paymentUri.html
|
||||
msgid "Network"
|
||||
msgstr "Red"
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "No pending spend proposals at the moment."
|
||||
msgstr "No hay gastos pendientes en este momento."
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "No transactions yet"
|
||||
msgstr "Sin transacciones todavía"
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Not valid"
|
||||
msgstr "No válido"
|
||||
|
||||
#: public/views/send.html public/views/modals/tx-details.html
|
||||
#: public/views/walletHome.html public/views/modals/tx-details.html
|
||||
#: public/views/modals/txp-details.html
|
||||
msgid "Note"
|
||||
msgstr "Nota"
|
||||
|
|
@ -361,10 +357,6 @@ msgstr "LISTO"
|
|||
msgid "OKAY"
|
||||
msgstr "LISTO"
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Opening Wallet..."
|
||||
msgstr "Abriendo Monedero..."
|
||||
|
||||
#: public/views/import.html public/views/importLegacy.html
|
||||
msgid "Password"
|
||||
msgstr "Contraseña"
|
||||
|
|
@ -395,7 +387,7 @@ msgstr "Detalles del pago"
|
|||
msgid "Payment protocol request"
|
||||
msgstr "Solicitud de pago"
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Payment to"
|
||||
msgstr "Pago a"
|
||||
|
||||
|
|
@ -414,17 +406,21 @@ msgstr "Monedero Personal"
|
|||
msgid "Preferences"
|
||||
msgstr "Preferencias"
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Received"
|
||||
msgstr "Recibido"
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Reconnecting to Wallet Service..."
|
||||
msgstr "Reconectando a Wallet Service..."
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Recreate"
|
||||
msgstr "Recrear"
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Recreating Wallet on BWS..."
|
||||
msgstr "Recreando Monedero en BWS..."
|
||||
msgid "Recreating Wallet..."
|
||||
msgstr "Recreando Monedero..."
|
||||
|
||||
#: public/views/modals/txp-details.html
|
||||
msgid "Reject"
|
||||
|
|
@ -446,7 +442,7 @@ msgstr "Requerido"
|
|||
msgid "SET"
|
||||
msgstr "ESTABLECER"
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "SKIP BACKUP"
|
||||
msgstr "OMITIR"
|
||||
|
||||
|
|
@ -484,9 +480,9 @@ msgstr "Seleccione las firmas requeridas"
|
|||
|
||||
#: public/views/create.html
|
||||
msgid "Select total number of copayers"
|
||||
msgstr "Seleccione el total de compañeros"
|
||||
msgstr "Seleccione el total de copayers"
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Send"
|
||||
msgstr "Enviar"
|
||||
|
||||
|
|
@ -494,7 +490,7 @@ msgstr "Enviar"
|
|||
msgid "Send by email"
|
||||
msgstr "Enviar por correo electrónico"
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Sent"
|
||||
msgstr "Enviado"
|
||||
|
||||
|
|
@ -510,7 +506,7 @@ msgstr "Establecer contraseña para tu copia de seguridad"
|
|||
msgid "Set up a password"
|
||||
msgstr "Configure una contraseña"
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Share address"
|
||||
msgstr "Compartir dirección"
|
||||
|
||||
|
|
@ -522,7 +518,7 @@ msgstr "Compartir invitación"
|
|||
msgid "Share this invitation with your copayers"
|
||||
msgstr "Compartir esta invitación con tus compañeros"
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid ""
|
||||
"Share this with anyone to have them send you payments. To protect your "
|
||||
"privacy, new addresses are generated automatically once you use them."
|
||||
|
|
@ -546,7 +542,7 @@ msgstr "Firmas"
|
|||
msgid "Spend proposals"
|
||||
msgstr "Propuestas de gastos"
|
||||
|
||||
#: public/views/history.html public/views/walletHome.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Tap to retry"
|
||||
msgstr "Toque para reintentar"
|
||||
|
||||
|
|
@ -574,7 +570,7 @@ msgstr ""
|
|||
msgid "Time"
|
||||
msgstr "Hora"
|
||||
|
||||
#: public/views/send.html public/views/includes/transaction.html
|
||||
#: public/views/walletHome.html public/views/includes/transaction.html
|
||||
#: public/views/modals/paypro.html public/views/modals/tx-details.html
|
||||
#: public/views/modals/txp-details.html
|
||||
msgid "To"
|
||||
|
|
@ -604,11 +600,7 @@ msgstr "Propuestas de transacción"
|
|||
msgid "Transaction sent!"
|
||||
msgstr "¡Transacción enviada!"
|
||||
|
||||
#: public/views/includes/offline.html
|
||||
msgid "Trying to reconnnect..."
|
||||
msgstr "Intentando reconectar..."
|
||||
|
||||
#: public/views/history.html public/views/modals/tx-details.html
|
||||
#: public/views/walletHome.html public/views/modals/tx-details.html
|
||||
msgid "Unconfirmed"
|
||||
msgstr "Sin confirmar"
|
||||
|
||||
|
|
@ -625,16 +617,8 @@ msgid "Untrusted"
|
|||
msgstr "No es de confianza"
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Updating Balance..."
|
||||
msgstr "Actualizando Balance..."
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Updating Pending Transactions..."
|
||||
msgstr "Actualizando Transacciones Pendientes..."
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Updating Status..."
|
||||
msgstr "Actualizando Estado..."
|
||||
msgid "Updating Wallet..."
|
||||
msgstr "Actualizando Monedero..."
|
||||
|
||||
#: public/views/create.html
|
||||
msgid "Use test network"
|
||||
|
|
@ -644,7 +628,7 @@ msgstr "Red de prueba"
|
|||
msgid "View backup"
|
||||
msgstr "Ver Copia de Seguridad"
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "WARNING: Backup needed"
|
||||
msgstr "ADVERTENCIA: Se requiere hacer copia de seguridad"
|
||||
|
||||
|
|
@ -658,7 +642,7 @@ msgstr "BIENVENIDO A"
|
|||
|
||||
#: public/views/copayers.html
|
||||
msgid "Waiting for copayers"
|
||||
msgstr "Esperando compañeros"
|
||||
msgstr "Esperando a mis copayers"
|
||||
|
||||
#: public/views/copayers.html
|
||||
msgid "Waiting..."
|
||||
|
|
@ -672,10 +656,6 @@ msgstr "Invitación para unirse al monedero"
|
|||
msgid "Wallet Invitation is not valid!"
|
||||
msgstr "¡Invitación no válida!"
|
||||
|
||||
#: public/views/includes/clientError.html
|
||||
msgid "Wallet Service Error"
|
||||
msgstr "Error en Wallet Service"
|
||||
|
||||
#: public/views/copayers.html
|
||||
msgid "Wallet incomplete and broken"
|
||||
msgstr "Monedero incompleto y roto"
|
||||
|
|
@ -712,7 +692,7 @@ msgstr "Contraseña de tu perfil"
|
|||
msgid "advanced options"
|
||||
msgstr "opciones avanzadas"
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "in pending transactions"
|
||||
msgstr "en transacciones pendientes"
|
||||
|
||||
|
|
@ -721,11 +701,11 @@ msgstr "en transacciones pendientes"
|
|||
msgid "of"
|
||||
msgstr "de"
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "optional"
|
||||
msgstr "opcional"
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "too long!"
|
||||
msgstr "¡demasiado largo!"
|
||||
|
||||
|
|
@ -737,6 +717,27 @@ msgstr "monedero"
|
|||
msgid "{{index.walletName}} settings"
|
||||
msgstr "Opciones de {{index.walletName}}"
|
||||
|
||||
#~ msgid "Fetching Payment Information..."
|
||||
#~ msgstr "Buscando información del pago"
|
||||
|
||||
#~ msgid "Getting transactions..."
|
||||
#~ msgstr "Cargando transacciones..."
|
||||
|
||||
#~ msgid "Joining shared wallet..."
|
||||
#~ msgstr "Unirse a un monedero..."
|
||||
|
||||
#~ msgid "Trying to reconnnect..."
|
||||
#~ msgstr "Intentando reconectar..."
|
||||
|
||||
#~ msgid "Updating Pending Transactions..."
|
||||
#~ msgstr "Actualizando Transacciones Pendientes..."
|
||||
|
||||
#~ msgid "Updating Status..."
|
||||
#~ msgstr "Actualizando Estado..."
|
||||
|
||||
#~ msgid "Wallet Service Error"
|
||||
#~ msgstr "Error en Wallet Service"
|
||||
|
||||
#~ msgid "To:"
|
||||
#~ msgstr "Para:"
|
||||
|
||||
|
|
@ -767,9 +768,6 @@ msgstr "Opciones de {{index.walletName}}"
|
|||
#~ msgid "Label"
|
||||
#~ msgstr "Etiqueta"
|
||||
|
||||
#~ msgid "Loading..."
|
||||
#~ msgstr "Cargando..."
|
||||
|
||||
#~ msgid "Note:"
|
||||
#~ msgstr "Nota:"
|
||||
|
||||
|
|
@ -1029,9 +1027,6 @@ msgstr "Opciones de {{index.walletName}}"
|
|||
#~ msgid "Needs Backup"
|
||||
#~ msgstr "Copia de Seguridad necesaria"
|
||||
|
||||
#~ msgid "Network Error"
|
||||
#~ msgstr "Error de Red"
|
||||
|
||||
#~ msgid "Networking Error"
|
||||
#~ msgstr "Error de Red"
|
||||
|
||||
|
|
|
|||
110
po/template.pot
110
po/template.pot
|
|
@ -29,12 +29,12 @@ msgid "Alternative Currency"
|
|||
msgstr ""
|
||||
|
||||
#: public/views/paymentUri.html
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
#: public/views/modals/txp-details.html
|
||||
msgid "Amount"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Amount in"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ msgstr ""
|
|||
msgid "Applying changes"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Available Balance"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ msgstr ""
|
|||
msgid "Backup"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Backup now"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -62,7 +62,7 @@ msgstr ""
|
|||
msgid "Backup options"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Before receiving funds, it is highly recommended you backup your wallet keys."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -70,7 +70,7 @@ msgstr ""
|
|||
msgid "Bitcoin URI is NOT valid!"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Bitcoin address"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ msgid "CANCEL"
|
|||
msgstr ""
|
||||
|
||||
#: public/views/copayers.html
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
#: public/views/modals/confirmation.html
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
|
@ -104,6 +104,7 @@ msgstr ""
|
|||
msgid "Choose backup file from your computer"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/includes/topbar.html
|
||||
#: public/views/modals/copayers.html
|
||||
#: public/views/modals/paypro.html
|
||||
#: public/views/modals/scanner.html
|
||||
|
|
@ -136,11 +137,7 @@ msgstr ""
|
|||
msgid "Copy to clipboard"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/includes/offline.html
|
||||
msgid "Could not connect to Wallet Service"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Could not fetch transaction history"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -167,7 +164,7 @@ msgstr ""
|
|||
|
||||
#: public/views/create.html
|
||||
#: public/views/createProfile.html
|
||||
msgid "Creating wallet..."
|
||||
msgid "Creating Wallet..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/modals/tx-details.html
|
||||
|
|
@ -203,18 +200,10 @@ msgstr ""
|
|||
msgid "Family vacation funds"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
msgid "Fetching Payment Information..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Generate new address"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/history.html
|
||||
msgid "Getting transactions..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/preferences.html
|
||||
msgid "Global settings"
|
||||
msgstr ""
|
||||
|
|
@ -275,7 +264,7 @@ msgid "Join shared wallet"
|
|||
msgstr ""
|
||||
|
||||
#: public/views/join.html
|
||||
msgid "Joining shared wallet..."
|
||||
msgid "Joining Wallet..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/preferences.html
|
||||
|
|
@ -286,6 +275,10 @@ msgstr ""
|
|||
msgid "Learn more about Wallet Migration"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Loading..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/paymentUri.html
|
||||
msgid "Make a payment to"
|
||||
msgstr ""
|
||||
|
|
@ -308,11 +301,11 @@ msgstr ""
|
|||
msgid "Message"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "More"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Moved"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -320,23 +313,27 @@ msgstr ""
|
|||
msgid "Multisignature wallet"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "My Bitcoin address"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/paymentUri.html
|
||||
msgid "Network"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "No pending spend proposals at the moment."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "No transactions yet"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Not valid"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
#: public/views/modals/tx-details.html
|
||||
#: public/views/modals/txp-details.html
|
||||
msgid "Note"
|
||||
|
|
@ -350,10 +347,6 @@ msgstr ""
|
|||
msgid "OKAY"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Opening Wallet..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/import.html
|
||||
#: public/views/importLegacy.html
|
||||
msgid "Password"
|
||||
|
|
@ -383,7 +376,7 @@ msgstr ""
|
|||
msgid "Payment protocol request"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Payment to"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -399,16 +392,20 @@ msgstr ""
|
|||
msgid "Preferences"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Received"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Reconnecting to Wallet Service..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Recreate"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Recreating Wallet on BWS..."
|
||||
msgid "Recreating Wallet..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/modals/txp-details.html
|
||||
|
|
@ -433,7 +430,7 @@ msgstr ""
|
|||
msgid "SET"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "SKIP BACKUP"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -473,7 +470,7 @@ msgstr ""
|
|||
msgid "Select total number of copayers"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Send"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -481,7 +478,7 @@ msgstr ""
|
|||
msgid "Send by email"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Sent"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -497,7 +494,7 @@ msgstr ""
|
|||
msgid "Set up a password"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Share address"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -509,7 +506,7 @@ msgstr ""
|
|||
msgid "Share this invitation with your copayers"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Share this with anyone to have them send you payments. To protect your privacy, new addresses are generated automatically once you use them."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -531,7 +528,6 @@ msgstr ""
|
|||
msgid "Spend proposals"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "Tap to retry"
|
||||
msgstr ""
|
||||
|
|
@ -552,7 +548,7 @@ msgstr ""
|
|||
msgid "Time"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
#: public/views/includes/transaction.html
|
||||
#: public/views/modals/paypro.html
|
||||
#: public/views/modals/tx-details.html
|
||||
|
|
@ -584,11 +580,7 @@ msgstr ""
|
|||
msgid "Transaction sent!"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/includes/offline.html
|
||||
msgid "Trying to reconnnect..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/history.html
|
||||
#: public/views/walletHome.html
|
||||
#: public/views/modals/tx-details.html
|
||||
msgid "Unconfirmed"
|
||||
msgstr ""
|
||||
|
|
@ -606,15 +598,7 @@ msgid "Untrusted"
|
|||
msgstr ""
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Updating Balance..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Updating Pending Transactions..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/walletHome.html
|
||||
msgid "Updating Status..."
|
||||
msgid "Updating Wallet..."
|
||||
msgstr ""
|
||||
|
||||
#: public/views/create.html
|
||||
|
|
@ -625,7 +609,7 @@ msgstr ""
|
|||
msgid "View backup"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/receive.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "WARNING: Backup needed"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -653,10 +637,6 @@ msgstr ""
|
|||
msgid "Wallet Invitation is not valid!"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/includes/clientError.html
|
||||
msgid "Wallet Service Error"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/copayers.html
|
||||
msgid "Wallet incomplete and broken"
|
||||
msgstr ""
|
||||
|
|
@ -696,7 +676,7 @@ msgstr ""
|
|||
msgid "advanced options"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "in pending transactions"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -707,11 +687,11 @@ msgstr ""
|
|||
msgid "of"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "optional"
|
||||
msgstr ""
|
||||
|
||||
#: public/views/send.html
|
||||
#: public/views/walletHome.html
|
||||
msgid "too long!"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<section class="right-small" ng-show="!goBackToState">
|
||||
<a ng-show="!closeToHome && index.isComplete" class="p10"
|
||||
ng-click="topbar.openScanner()"><i class="fi-camera size-24"></i></a>
|
||||
<a ng-show="closeToHome"
|
||||
<a ng-show="closeToHome" class="p10"
|
||||
ng-click="topbar.goHome(); closeToHome = null">
|
||||
<span class="text-close">{{'Close'|translate}}</span>
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<nav class="tab-bar">
|
||||
<section class="right-small">
|
||||
<a ng-click="cancel()">
|
||||
<a ng-click="cancel()" class="p10">
|
||||
<span class="text-close" translate>Close</span>
|
||||
</a>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<nav class="tab-bar">
|
||||
<section class="right-small">
|
||||
<a ng-click="cancel()">
|
||||
<a ng-click="cancel()" class="p10">
|
||||
<span class="text-close" translate>Close</span>
|
||||
</a>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<nav class="tab-bar">
|
||||
<section class="right-small">
|
||||
<a ng-click="cancel()">
|
||||
<a ng-click="cancel()" class="p10">
|
||||
<span class="text-close" translate>Close</span>
|
||||
</a>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<nav class="tab-bar">
|
||||
<section class="right-small">
|
||||
<a ng-click="cancel()">
|
||||
<a ng-click="cancel()" class="p10">
|
||||
<span class="text-close" translate>Close</span>
|
||||
</a>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<nav class="tab-bar">
|
||||
<section class="right-small">
|
||||
<a ng-click="cancel()">
|
||||
<a ng-click="cancel()" class="p10">
|
||||
<span class="text-close" translate>Close</span>
|
||||
</a>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
<button class="button black expand" ng-click="$root.go('add')" translate>Create</button>
|
||||
</div>
|
||||
|
||||
<div class="onGoingProcess" ng-show="index.isOffline" style="background-color:#222">
|
||||
<div class="onGoingProcess" ng-show="index.isOffline">
|
||||
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
|
||||
<div class="spinner">
|
||||
<div class="rect1"></div>
|
||||
<div class="rect2"></div>
|
||||
|
|
@ -16,9 +17,11 @@
|
|||
<div class="rect5"></div>
|
||||
</div>
|
||||
<span translate>Reconnecting to Wallet Service...</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="onGoingProcess" ng-show="index.anyOnGoingProcess && !index.isOffline" ng-style="{'background-color':index.backgroundColor}">
|
||||
<div class="onGoingProcess" ng-show="index.anyOnGoingProcess && !index.isOffline">
|
||||
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
|
||||
<div class="spinner">
|
||||
<div class="rect1"></div>
|
||||
<div class="rect2"></div>
|
||||
|
|
@ -27,15 +30,17 @@
|
|||
<div class="rect5"></div>
|
||||
</div>
|
||||
<span translate ng-show="
|
||||
index.onGoingProcessName == 'openingWallet'
|
||||
|| index.onGoingProcessName == 'updatingStatus'
|
||||
|| index.onGoingProcessName == 'updatingBalance'
|
||||
"> Updating Wallet... </span>
|
||||
index.onGoingProcessName == 'openingWallet'
|
||||
|| index.onGoingProcessName == 'updatingStatus'
|
||||
|| index.onGoingProcessName == 'updatingBalance'
|
||||
"> Updating Wallet... </span>
|
||||
<span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
|
||||
<span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet...</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="onGoingProcess" ng-show="home.onGoingProcess && !index.anyOnGoingProcess">
|
||||
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
|
||||
<div class="spinner">
|
||||
<div class="rect1"></div>
|
||||
<div class="rect2"></div>
|
||||
|
|
@ -44,6 +49,7 @@ index.onGoingProcessName == 'openingWallet'
|
|||
<div class="rect5"></div>
|
||||
</div>
|
||||
{{home.onGoingProcess|translate}}...
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="oh" ng-show="!index.noFocusedWallet">
|
||||
|
|
|
|||
|
|
@ -1116,25 +1116,26 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
|
|||
}
|
||||
|
||||
.onGoingProcess {
|
||||
left: 0;
|
||||
width: 100%;
|
||||
bottom: 90px;
|
||||
position: absolute;
|
||||
z-index: 1020;
|
||||
}
|
||||
|
||||
.onGoingProcess-content {
|
||||
background: #213140;
|
||||
text-align: center;
|
||||
max-width: 16.5rem;
|
||||
max-height: 3.5rem;
|
||||
top:auto;
|
||||
left:0;
|
||||
right:0;
|
||||
bottom:170px;
|
||||
margin: auto;
|
||||
border-radius: 3px;
|
||||
color: #fff;
|
||||
padding: 0.5rem;
|
||||
font-size: 13px;
|
||||
position: absolute;
|
||||
opacity: 0.8;
|
||||
z-index: 10;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
|
||||
/*/////////////////// SPINNER ////////////////////*/
|
||||
|
||||
.spinner {
|
||||
|
|
|
|||
|
|
@ -127,10 +127,10 @@ _:-ms-fullscreen, :root .main {
|
|||
margin-left: 26px;
|
||||
font-size: 1rem;
|
||||
font-weight: 400;
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
.tab-bar .text-close {
|
||||
margin-right: 10px;
|
||||
font-size: 1rem;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
|
@ -582,6 +582,10 @@ a.pin-button:active {
|
|||
transform: none !important;
|
||||
}
|
||||
|
||||
.popup-tx-status {
|
||||
z-index: 1030;
|
||||
}
|
||||
|
||||
.popup-txsent {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
|
|
|
|||
|
|
@ -155,26 +155,26 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
return;
|
||||
};
|
||||
|
||||
if (isCordova) {
|
||||
window.plugins.spinnerDialog.show(null, 'Signing transaction...', true);
|
||||
}
|
||||
self.setOngoingProcess('Signing transaction');
|
||||
$scope.loading = true;
|
||||
$scope.error = null;
|
||||
$timeout(function() {
|
||||
fc.signTxProposal(txp, function(err, txpsi) {
|
||||
profileService.lockFC();
|
||||
if (isCordova) {
|
||||
window.plugins.spinnerDialog.hide();
|
||||
}
|
||||
$scope.loading = false;
|
||||
self.setOngoingProcess();
|
||||
if (err) {
|
||||
$scope.loading = false;
|
||||
$scope.error = err.message || 'Transaction not signed. Please try again.';
|
||||
$scope.$digest();
|
||||
} else {
|
||||
//if txp has required signatures then broadcast it
|
||||
var txpHasRequiredSignatures = txpsi.status == 'accepted';
|
||||
if (txpHasRequiredSignatures) {
|
||||
self.setOngoingProcess('Broadcasting transaction');
|
||||
$scope.loading = true;
|
||||
fc.broadcastTxProposal(txpsi, function(err, txpsb) {
|
||||
self.setOngoingProcess();
|
||||
$scope.loading = false;
|
||||
if (err) {
|
||||
$scope.error = 'Transaction not broadcasted. Please try again.';
|
||||
$scope.$digest();
|
||||
|
|
@ -183,6 +183,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
}
|
||||
});
|
||||
} else {
|
||||
$scope.loading = false;
|
||||
$modalInstance.close(txpsi);
|
||||
}
|
||||
}
|
||||
|
|
@ -191,16 +192,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
};
|
||||
|
||||
$scope.reject = function(txp) {
|
||||
if (isCordova) {
|
||||
window.plugins.spinnerDialog.show(null, 'Rejecting transaction...', true);
|
||||
}
|
||||
self.setOngoingProcess('Rejecting transaction');
|
||||
$scope.loading = true;
|
||||
$scope.error = null;
|
||||
$timeout(function() {
|
||||
fc.rejectTxProposal(txp, null, function(err, txpr) {
|
||||
if (isCordova) {
|
||||
window.plugins.spinnerDialog.hide();
|
||||
}
|
||||
self.setOngoingProcess();
|
||||
$scope.loading = false;
|
||||
if (err) {
|
||||
$scope.error = err.message || 'Transaction not rejected. Please try again.';
|
||||
|
|
@ -214,16 +211,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
|
||||
|
||||
$scope.remove = function(txp) {
|
||||
if (isCordova) {
|
||||
window.plugins.spinnerDialog.show(null, 'Deleting transaction...', true);
|
||||
}
|
||||
self.setOngoingProcess('Deleting transaction');
|
||||
$scope.loading = true;
|
||||
$scope.error = null;
|
||||
$timeout(function() {
|
||||
fc.removeTxProposal(txp, function(err, txpb) {
|
||||
if (isCordova) {
|
||||
window.plugins.spinnerDialog.hide();
|
||||
}
|
||||
self.setOngoingProcess();
|
||||
$scope.loading = false;
|
||||
|
||||
// Hacky: request tries to parse an empty response
|
||||
|
|
@ -238,16 +231,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
};
|
||||
|
||||
$scope.broadcast = function(txp) {
|
||||
if (isCordova) {
|
||||
window.plugins.spinnerDialog.show(null, 'Sending transaction...', true);
|
||||
}
|
||||
self.setOngoingProcess('Broadcasting transaction');
|
||||
$scope.loading = true;
|
||||
$scope.error = null;
|
||||
$timeout(function() {
|
||||
fc.broadcastTxProposal(txp, function(err, txpb) {
|
||||
if (isCordova) {
|
||||
window.plugins.spinnerDialog.hide();
|
||||
}
|
||||
self.setOngoingProcess();
|
||||
$scope.loading = false;
|
||||
if (err) {
|
||||
$scope.error = err.message || 'Transaction not sent. Please try again.';
|
||||
|
|
@ -449,7 +438,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
$timeout(function() {
|
||||
self.onGoingProcess = name;
|
||||
$rootScope.$apply();
|
||||
})
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -471,7 +460,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
return;
|
||||
};
|
||||
|
||||
self.setOngoingProcess('Sending transaction');
|
||||
self.setOngoingProcess('Creating transaction');
|
||||
$timeout(function() {
|
||||
var comment = form.comment.$modelValue;
|
||||
var paypro = self._paypro;
|
||||
|
|
@ -493,7 +482,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
}
|
||||
|
||||
self.signAndBroadcast(txp, function(err) {
|
||||
self.setOngoingProcess();
|
||||
profileService.lockFC();
|
||||
if (err) {
|
||||
return self.setError(err);
|
||||
|
|
@ -512,7 +500,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
profileService.lockFC();
|
||||
self.setOngoingProcess();
|
||||
|
||||
if (err) return cb(err);
|
||||
if (err) {
|
||||
return cb(err);
|
||||
}
|
||||
|
||||
if (signedTx.status == 'accepted') {
|
||||
self.setOngoingProcess('Broadcasting transaction');
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash,
|
|||
};
|
||||
$modal.open({
|
||||
templateUrl: 'views/modals/tx-status.html',
|
||||
windowClass: 'full',
|
||||
windowClass: 'full popup-tx-status',
|
||||
controller: ModalInstanceCtrl,
|
||||
});
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue