Fix padding bottom in modals. Updates translations

This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-30 23:22:15 -03:00
commit e8a89f4a16
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 44 additions and 16 deletions

View file

@ -872,10 +872,34 @@ msgstr "Listo"
msgid "Tap to retry" msgid "Tap to retry"
msgstr "Toque para reintentar" msgstr "Toque para reintentar"
#: src/js/controllers/walletHome.js
msgid ""
"The payment was created but could not be completed. Please try again from "
"home screen"
msgstr ""
"El pago fue creado pero no se pudo completar. Por favor intente nuevamente "
"desde la pantalla de inicio."
#: src/js/controllers/walletHome.js
msgid ""
"The payment was created but could not be signed. Please try again from home "
"screen."
msgstr ""
"El pago fue creado pero no pudo ser firmado. Por favor intente nuevamente "
"desde la pantalla de inicio."
#: public/views/modals/txp-details.html #: public/views/modals/txp-details.html
msgid "The payment was removed by creator" msgid "The payment was removed by creator"
msgstr "El pago fue eliminado por el creador" msgstr "El pago fue eliminado por el creador"
#: src/js/controllers/walletHome.js
msgid ""
"The payment was signed but could not be broadcasted. Please try again from "
"home screen."
msgstr ""
"El pago fue firmado pero no pudo ser enviado. Por favor intente nuevamente "
"desde la pantalla de inicio."
#: public/views/backup.html #: public/views/backup.html
msgid "" msgid ""
"The private key for this wallet is encrypted. Exporting a backup will keep " "The private key for this wallet is encrypted. Exporting a backup will keep "
@ -917,10 +941,6 @@ msgstr "Balance total bloqueado"
msgid "Transaction" msgid "Transaction"
msgstr "Transacción" msgstr "Transacción"
#: src/js/controllers/walletHome.js
msgid "Transaction not broadcasted. Please try again."
msgstr "Transacción no emitida. Por favor, intente nuevamente."
#: src/js/controllers/walletHome.js #: src/js/controllers/walletHome.js
msgid "Unable to send transaction proposal" msgid "Unable to send transaction proposal"
msgstr "No se puede enviar propuesta de transacción" msgstr "No se puede enviar propuesta de transacción"
@ -1050,8 +1070,8 @@ msgid "email for wallet notifications"
msgstr "email para recibir notificaciones" msgstr "email para recibir notificaciones"
#: public/views/walletHome.html #: public/views/walletHome.html
msgid "in pending payments" msgid "locked by pending payments"
msgstr "en pagos pendientes" msgstr "bloqueado por pagos pendientes"
#: public/views/copayers.html public/views/create.html #: public/views/copayers.html public/views/create.html
#: public/views/walletHome.html public/views/includes/sidebar.html #: public/views/walletHome.html public/views/includes/sidebar.html
@ -1082,6 +1102,9 @@ msgstr ""
"{{len}} monederos importados. Escáner de fondos en progreso. Espere a ver el " "{{len}} monederos importados. Escáner de fondos en progreso. Espere a ver el "
"balance actualizado" "balance actualizado"
#~ msgid "Transaction not broadcasted. Please try again."
#~ msgstr "Transacción no emitida. Por favor, intente nuevamente."
#~ msgid "Could not sign transaction. Please try again." #~ msgid "Could not sign transaction. Please try again."
#~ msgstr "No se pudo firmar la transacción. Por favor, intente nuevamente." #~ msgstr "No se pudo firmar la transacción. Por favor, intente nuevamente."
@ -1142,9 +1165,6 @@ msgstr ""
#~ msgid "{{index.walletName}} settings" #~ msgid "{{index.walletName}} settings"
#~ msgstr "Opciones de {{index.walletName}}" #~ msgstr "Opciones de {{index.walletName}}"
#~ msgid "Transaction could not be deleted. Please try again."
#~ msgstr "La transacción no se pudo eliminar. Por favor, intente nuevamente."
#~ msgid "Transaction not rejected. Please try again." #~ msgid "Transaction not rejected. Please try again."
#~ msgstr "Transacción no rechazada. Por favor, intente nuevamente." #~ msgstr "Transacción no rechazada. Por favor, intente nuevamente."

View file

@ -854,10 +854,22 @@ msgstr ""
msgid "Tap to retry" msgid "Tap to retry"
msgstr "" msgstr ""
#: src/js/controllers/walletHome.js
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr ""
#: src/js/controllers/walletHome.js
msgid "The payment was created but could not be signed. Please try again from home screen."
msgstr ""
#: public/views/modals/txp-details.html #: public/views/modals/txp-details.html
msgid "The payment was removed by creator" msgid "The payment was removed by creator"
msgstr "" msgstr ""
#: src/js/controllers/walletHome.js
msgid "The payment was signed but could not be broadcasted. Please try again from home screen."
msgstr ""
#: public/views/backup.html #: public/views/backup.html
msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive."
msgstr "" msgstr ""
@ -894,10 +906,6 @@ msgstr ""
msgid "Transaction" msgid "Transaction"
msgstr "" msgstr ""
#: src/js/controllers/walletHome.js
msgid "Transaction not broadcasted. Please try again."
msgstr ""
#: src/js/controllers/walletHome.js #: src/js/controllers/walletHome.js
msgid "Unable to send transaction proposal" msgid "Unable to send transaction proposal"
msgstr "" msgstr ""
@ -1026,7 +1034,7 @@ msgid "email for wallet notifications"
msgstr "" msgstr ""
#: public/views/walletHome.html #: public/views/walletHome.html
msgid "in pending payments" msgid "locked by pending payments"
msgstr "" msgstr ""
#: public/views/copayers.html #: public/views/copayers.html

View file

@ -92,14 +92,14 @@
<div class="row m20t" ng-if="tx.pendingForUs"> <div class="row m20t" ng-if="tx.pendingForUs">
<div class="large-5 medium-5 small-6 columns"> <div class="large-5 medium-5 small-6 columns">
<button class="button outline round dark-gray m0 expand" ng-click="reject(tx);" <button class="button outline round dark-gray expand" ng-click="reject(tx);"
ng-disabled="loading"> ng-disabled="loading">
<i class="fi-x"></i> <i class="fi-x"></i>
<span translate>Reject</span> <span translate>Reject</span>
</button> </button>
</div> </div>
<div class="large-5 medium-5 small-6 columns text-right"> <div class="large-5 medium-5 small-6 columns text-right">
<button class="button primary round m0 expand" ng-click="sign(tx)" <button class="button primary round expand" ng-click="sign(tx)"
ng-style="{'background-color':color}" ng-style="{'background-color':color}"
ng-disabled="loading"> ng-disabled="loading">
<i class="fi-check"></i> <i class="fi-check"></i>