diff --git a/.gitignore b/.gitignore index 7f26c1ac0..837bbf05d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,15 @@ src/js/version.js cordova/project/* cordova/*.keystore +# node-webkit +cache +webkitbuilds/* +!webkitbuilds/README.md +!webkitbuilds/setup-win32.iss +!webkitbuilds/setup-win64.iss +!webkitbuilds/favicon.ico +!webkitbuilds/.desktop + # chrome extensions browser-extensions/chrome/copay-chrome-extension browser-extensions/chrome/copay-chrome-extension.zip diff --git a/Gruntfile.js b/Gruntfile.js index ff1368ead..0ab31cdc4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -30,6 +30,12 @@ module.exports = function(grunt) { }, clear: { command: 'rm -Rf bower_components node_modules' + }, + osx64: { + command: 'hdiutil create -megabytes 150 -volname Copay -srcfolder webkitbuilds/copay/osx64/copay.app/ -ov -format UDZO webkitbuilds/copay-osx64.dmg' + }, + osx32: { + command: 'hdiutil create -megabytes 150 -volname Copay -srcfolder webkitbuilds/copay/osx32/copay.app/ -ov -format UDZO webkitbuilds/copay-osx32.dmg' } }, watch: { @@ -165,6 +171,12 @@ module.exports = function(grunt) { flatten: true, src: 'bower_components/foundation-icon-fonts/foundation-icons.*', dest: 'public/icons/' + }, + linux: { + files: [ + {expand: true, cwd: 'webkitbuilds/',src: ['.desktop', 'favicon.ico'],dest: 'webkitbuilds/copay/linux32/', flatten: true, filter: 'isFile' }, + {expand: true, cwd: 'webkitbuilds/',src: ['.desktop', 'favicon.ico'],dest: 'webkitbuilds/copay/linux64/', flatten: true, filter: 'isFile' }, + ], } }, karma: { @@ -184,6 +196,36 @@ module.exports = function(grunt) { force: true, recursive: false } + }, + nodewebkit: { + options: { + platforms: ['win','osx','linux'], + buildDir: './webkitbuilds', + version: '0.12.2', + macIcns: './public/img/icons/icon.icns', + exeIco: './public/img/icons/icon.ico' + }, + src: ['./package.json', './public/**/*'] + }, + compress: { + linux32: { + options: { + archive: './webkitbuilds/copay-linux32.zip' + }, + expand: true, + cwd: './webkitbuilds/copay/linux32/', + src: ['**/*'], + dest: 'copay-linux32/' + }, + linux64: { + options: { + archive: './webkitbuilds/copay-linux64.zip' + }, + expand: true, + cwd: './webkitbuilds/copay/linux64/', + src: ['**/*'], + dest: 'copay-linux64/' + } } }); @@ -197,10 +239,11 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-exec'); grunt.loadNpmTasks('grunt-karma'); grunt.loadNpmTasks('grunt-karma-coveralls'); - + grunt.loadNpmTasks('grunt-node-webkit-builder'); + grunt.loadNpmTasks('grunt-contrib-compress'); grunt.registerTask('default', [ - 'nggettext_compile', 'exec:version', 'concat', 'copy' + 'nggettext_compile', 'exec:version', 'concat', 'copy:icons' ]); grunt.registerTask('prod', [ 'default', 'uglify' @@ -208,4 +251,5 @@ module.exports = function(grunt) { grunt.registerTask('translate', ['nggettext_extract']); grunt.registerTask('test', ['karma:unit']); grunt.registerTask('test-coveralls', ['karma:prod', 'coveralls']); + grunt.registerTask('desktop', ['prod', 'nodewebkit', 'copy:linux', 'compress:linux32', 'compress:linux64', 'exec:osx32', 'exec:osx64']); }; diff --git a/README.md b/README.md index 8ae2959f0..183d41342 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,28 @@ -Copay +Copay [![Build Status](https://secure.travis-ci.org/bitpay/copay.svg)](http://travis-ci.org/bitpay/copay) -[![Coverage Status](https://img.shields.io/coveralls/bitpay/copay.svg)](https://coveralls.io/r/bitpay/copay?branch=master) -[![Stories in Ready](https://badge.waffle.io/bitpay/copay.svg?label=in progress&title=In progress)](https://waffle.io/bitpay/copay) -*Copay* is an easy-to-use, open-source, multiplatform, multisignature, secure bitcoin wallet platform for both individuals and companies. +Copay is an easy-to-use, open-source, multiplatform, multisignature, secure bitcoin wallet platform for both individuals and companies. Copay uses Bitcore-Wallet-Service (https://github.com/bitpay/bitcore-wallet-service) for peer synchronization and bitcore network interfacing. -*Copay* uses Bitcore-Wallet-Service (https://github.com/bitpay/bitcore-wallet-service) for peer synchronization and bitcore network interfacing. +Binary versions of Copay are available for download at [Copay.io](https://copay.io) -## Before you start +## Main Features -Current Copay version is meant to be run on *mobile devices OR desktop application*, NOT browsers. + - Multiple wallet creation and management in-app + - Intuitive multisignature security for personal or shared wallets + - Easy spending proposal flow for shared wallets and group payments + - Hierarchical deterministic (HD) address generation and wallet backups + - Device-based security: all private keys are stored locally, not in the cloud + - Support for Bitcoin testnet wallets + - Synchronous access across all major mobile and desktop platforms + - Payment protocol (BIP70-BIP73) support: easily-identifiable payment requests and verifiably secure bitcoin payments + - Support for 150+ currency pricing options and unit denomination in BTC or bits + - Email notifications for payments and transfers + - Customizable wallet naming and background colors + - Multiple languages supported + - Available for iOS, Android, Windows Phone, Chrome App, Linux, Windows and OSX. -When running Copay as a web page, and a browser extension is enabled, the browser extension -could have access to Copay internal data, and compromise the user's private key -and more. - -## Installation +# Installation ```sh git clone https://github.com/bitpay/copay.git @@ -30,131 +36,82 @@ npm install -g bower npm install -g grunt-cli ``` -Build *Copay*: +Build Copay: ```sh bower install npm install grunt -``` - -For production environments: - -```sh -grunt prod -``` - -Open *Copay*: - -```sh npm start ``` Then visit localhost:3000 in your browser. -## Bitcore Wallet Service +When running Copay as a web page, and a browser extension is enabled, the browser extension +could have access to Copay internal data, and compromise the user's private key +and more. -Copay depends on Bitcore Wallet Service (BWS) for blockchain information, networking and copayer synchronization. BWS can be run within minutes or you can use a public instance. Switch between BWS instances is very simple and can be done with a click from Copay. BWS also allows Copay to interoperate with others wallet like Bitcore-Wallet CLI https://github.com/bitpay/bitcore-wallet +## Build Copay App Bundles +## Android -## Tests + - Install Android SDK + - Run `make android` -Open test/index.html in your browser to test models. Install [mocha](https://www.npmjs.com/package/mocha) and [karma](https://www.npmjs.com/package/karma-cli) to test the services and controllers. +### iOS -```sh -npm install mocha -npm install karma-cli -``` + - Install XCode 6.1 (or newer) + - Run `make ios-prod` -Run all tests: +### Windows Phone -```sh -mocha -karma start -``` + - Install Visual Studio 2013 (or newer) + - Run `make wp8-prod` -## Troubleshooting +### Desktop versions (Windows, OSX, Linux) -### Building on Ubuntu 14.04, gyp, Python +Copay uses NW.js (also know as node-webkit) for its desktop version. NW.js an app runtime based on `Chromium` and `node.js`. -If you are using Ubuntu and encounter this error (or one similar): + - Install NW.js in your system from [nw.js](http://nwjs.io/) + - Run `grunt desktop` (*) + +### Google Chrome App -```sh -gyp_main.py: error: no such option: --no-parallel -gyp ERR! configure error -gyp ERR! stack Error: `gyp` failed with exit code: 2 -``` - -This is because Ubuntu 14.04 and 14.10 have Python 2.7 installed by default but **gyp** requires Python 2.6. See: (http://stackoverflow.com/questions/21155922/error-installing-node-gyp-on-ubuntu) - -One solution to this issue is to use *Copay* with a Python version manager and install 2.6. For example, if you have pyenv installed: - -```sh -pyenv install 2.6.9 -pyenv global 2.6.9 -``` - -# Development - -## Google Chrome App - -To build *Copay*'s Chrome App, run: - -```sh -npm run-script chrome -``` + - Run `npm run-script chrome` On success, the chrome extension will be located at: `browser-extensions/chrome/copay-chrome-extension` To install it go to `chrome://extensions/` in your Chrome browser and ensure you have the 'developer mode' option enabled in the settings. Then click on "Load unpacked chrome extension" and choose the directory mentioned above. -## Firefox Add-on +### Firefox Add-on The *Copay* Firefox Extension has been deprecated and is no longer supported. -# QA and Bug Reporting -In the interest of improving bug reporting, for each bug that you find and want to create a ticket about, please refer to a form that contains: -* A brief description of the bug -* Steps required to reproduce it -* The platform in which you are testing -* Any screenshots, if possible -* The expected behaviour - -For example, a really useful bug report should look like: - -``` -Problem: The application fails at login. - -To reproduce: -1. Launch the app with `npm run start` -2. Click on "Join a Wallet" -3. Type an nonexistent username -4. The app stops working and throws an "Unhandled exception" error. - -Expected: The app should login to the home screen after clicking login and show no errors. - -Platform: Android 4.3, Android 4.4, iOS -``` - -# About *Copay* +# About Copay ## General -*Copay* implements a multisig wallet using [p2sh](https://en.bitcoin.it/wiki/Pay_to_script_hash) addresses. It supports multiple wallet, with with its own configuration, such as 3-of-5 (3 required signatures from 5 participant peers) or 2-of-3. To create a multisig wallet shared between multiple participants, *Copay* requires the extended public keys of all the wallet participants. Those public keys are then incorporated into the wallet configuration and combined to generate a payment address where funds can be sent into the wallet. Conversely, each participant manages their own private key and that private key is never transmitted anywhere. +Copay implements a multisig wallet using [p2sh](https://en.bitcoin.it/wiki/Pay_to_script_hash) addresses. It supports multiple wallet, with with its own configuration, such as 3-of-5 (3 required signatures from 5 participant peers) or 2-of-3. To create a multisig wallet shared between multiple participants, Copay requires the extended public keys of all the wallet participants. Those public keys are then incorporated into the wallet configuration and combined to generate a payment address where funds can be sent into the wallet. Conversely, each participant manages their own private key and that private key is never transmitted anywhere. To unlock a payment and spend the wallet's funds, a quorum of participant signatures must be collected and assembled in the transaction. The funds cannot be spent without at least the minimum number of signatures required by the wallet configuration (2 of 3, 3 of 5, 6 of 6, etc). Once a transaction proposal is created, the proposal is distributed among the wallet participants for each to sign the transaction locally. Once the transaction is signed, the last signing participant will broadcast the transaction to the Bitcoin network. -*Copay* also implements [BIP32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki) to generate new addresses for peers. The public key that each participant contributes to the wallet is a BIP32 extended public key. As additional public keys are needed for wallet operations (to produce new addresses to receive payments into the wallet, for example) new public keys can be derived from the participants' original extended public keys. Once again, it's important to stress that each participant keeps their own private keys locally - private keys are not shared - and are used to sign transaction proposals to make payments from the shared wallet. +Copay also implements [BIP32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki) to generate new addresses for peers. The public key that each participant contributes to the wallet is a BIP32 extended public key. As additional public keys are needed for wallet operations (to produce new addresses to receive payments into the wallet, for example) new public keys can be derived from the participants' original extended public keys. Once again, it's important to stress that each participant keeps their own private keys locally - private keys are not shared - and are used to sign transaction proposals to make payments from the shared wallet. + +For more information regarding how addresses are generated using this procedure, see: [Structure for Deterministic P2SH Multisignature Wallets](https://github.com/bitcoin/bips/blob/master/bip-0045.mediawiki). + +# Bitcore Wallet Service + +Copay depends on [Bitcore Wallet Service](https://github.com/bitpay/bitcore-wallet-service) (BWS) for blockchain information, networking and copayer synchronization. BWS can be run within minutes or you can use a public instance. Switch between BWS instances is very simple and can be done with a click from Copay. BWS also allows Copay to interoperate with others wallet like Bitcore-Wallet CLI https://github.com/bitpay/bitcore-wallet. + +Alternativelly, public BWS instances (like `https://bws.bitpay.com`) can be used. + +# Translations + +Copay uses standart gettext PO files for tranlations. It is currently translated to spanish, japanese, french, german and portuguese thank to community contributions. See https://github.com/bitpay/copay/pull/2880 as an example pull request for adding translations. + +Translation Credits: Japanese: @dabura667, French: @kirvx, Portuguese: @pmichelazzo, Spanish: @cmgustavo, German: @saschad. Gracias totales! -For more information regarding how addresses are generated using this procedure, see: [Structure for Deterministic P2SH Multisignature Wallets](https://github.com/maraoz/bips/blob/master/bip-NNNN.mediawiki). -## Bitcore -Copay uses the powerful and feature-rich [Bitcore](https://github.com/bitpay/bitcore) Javascript library for Bitcoin-related functions. Bitcore should be built this way: -## Payment Protocol -Copay currently supports [BIP70 (Payment Protocol)](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki), with the following limitations: -* Only one output is allowed. Payment requests that are more that one output are not supported. -* Only standard Pay-to-pubkeyhash and Pay-to-scripthash scripts are supported (on payment requests). Other script types will cause the entire payment request to be rejected. -* Memos from the customer to the server are not supported (i.e. there is no place to write messages to the server in the current UX) diff --git a/appstore_de b/appstore_de new file mode 100644 index 000000000..e0448ff0c --- /dev/null +++ b/appstore_de @@ -0,0 +1,42 @@ +-------------------------------- +Google Play Store Beschreibung +-------------------------------- +Sichere Bitcoins zu eigenen Bedingungen, mit einem quelloffenen Gemeinschaftswallet(elektronische Brieftasche mit Mehrfachunterschriften) von BitPay. +Copay Nutzer können ihre Beträge individuell speichern oder ihre Finanzen mit anderen Nutzern in Gemeinschaftswallets teilen, die je nach Einstellung mehrere Bestätigungen (elektronische Unterschriften) benötigen und so nichtautorisierte Zahlungen verhindern. +Ein paar Einsatzmöglichkeiten, wie ein solches Wallet mit anderen Copayern genutzt werden kann: + +Ansparen von Beträgen für Urlaub oder gemeinsame Anschaffungen (z.B. mit Freunden) +Überwachung von Ausgaben und Einkünften der Familie +Organisation der Ausgaben in Firmen, Vereinen oder Organisationen + +Folgende Funktionen wurden in diese Version von Copay eingebaut um ein Bitcoin Wallet anzubieten das keine Kompromisse in Sichereit oder Zugänglichkeit eingeht: + +Anlage und Verwaltung von mehreren Wallets innerhalb der Anwendung +Intiutive mehrfachunterschriften Sicherheit für persönliche und geteilete Wallets +Einfache Ausgabenvorschläge für geteilte Walltes und Gruppenzahlungen +Hierarchische deterministische(HD) Adresserzeugung und Sicherung der Wallets +Gerätebasierte Sicherheit: Alle privaten Schlüssel werden auf dem Gerät und nicht in der Cloud gespreichert +Unterstützung von Bitcoin Testnet Wallets +Gleichzeitiger Zugriff über alle wichtigen mobilen Systeme und Desktop-Plattformen +Zahlungsprotokoll (BIP70-BIP73) Unterstützung: Leicht identifizierbare Zahlungsanforderungen und nachvollziehbare sichere Bitcoinzahlungen. +Unterstützung von 150+ verschiedenen Währungen und Stückelung in BTC oder bits +E-Mail Benachrichtigung für Zahlungen und Transaktionen +Anpasspare Wallets: Eigene Namen und Hintergrundfarben +6 unterstützte Sprachen (deutsch, englisch, spanisch, französisch, japanisch, portugiesisch) + +Copay ist eine kostenlose und quelloffene Software, die auf nicht firmeneigenen Servern läuft und es somit nicht nötig ist, sich auf ein bestimmtes Unternehmen und dessen kontinuierliche Unterstützung zu verlassen. Jeder hat die Möglichkeit den Quelltext zu überprüfen oder auf GitHub (https://github.com/bitpay/copay) eigene Änderungen beizutragen und an der Weiterentwicklung mitzuwirken. + +-------------------------------- +Google Play Store Release Notes: "What's new" +-------------------------------- +v1.0.2 +-------------------------------- +Nach achtmonatigem Test hat Copay die Betaphase verlassen! +-------------------------------- +v1.0.1 +-------------------------------- +Besserer Umgang mit Fehlern durch Netzwerkunterbrechungen +Bessere Logik nach Akzeptanz oder Ablehung von Zahlungen +Aktualisierung von ES, FR and JP Übersetzungen +Korrektur der Scroll-/Blätterfunktion in einigen Popups +-------------------------------- diff --git a/appstore_en b/appstore_en new file mode 100644 index 000000000..deb67f576 --- /dev/null +++ b/appstore_en @@ -0,0 +1,51 @@ +-------------------------------- +Google Play store description +-------------------------------- +Secure bitcoin on your own terms with an open source, multisignature wallet from BitPay. +Copay users can hold funds individually or share finances securely with other users with multisignature wallets, which prevent unauthorized payments by requiring multiple approvals. Here are some ways Copay can be used with others: + +To save for vacations or joint purchases with friends +To track family spending and allowances +To manage business, club, or organization funds and expenses + +We built the following features into this version of Copay for a bitcoin wallet that doesn't compromise on security or accessibility: + +Multiple wallet creation and management in-app +Intuitive multisignature security for personal or shared wallets +Easy spending proposal flow for shared wallets and group payments +Hierarchical deterministic (HD) address generation and wallet backups +Device-based security: all private keys are stored locally, not in the cloud +Support for Bitcoin testnet wallets +Synchronous access across all major mobile and desktop platforms +Payment protocol (BIP70-BIP73) support: easily-identifiable payment requests and verifiably secure bitcoin payments +Support for 150+ currency pricing options and unit denomination in BTC or bits +Email notifications for payments and transfers +Customizable wallet naming and background colors +4 supported languages (EN, JP, FR, ES) + +Copay is free and open source software run on non-proprietary servers, so there's no need to rely on any company for continuous support. Anyone can review or contribute to Copay's source code on GitHub (https://github.com/bitpay/copay). + +-------------------------------- +Google Play store Release Notes: "What's new" +-------------------------------- +v1.1.0 +-------------------------------- +QR Codes with specified amount for Receiving Payments +Fund Transfer Between Wallets +HTML Email Notifications +Custom Transaction Fee Settings +Send Maximum Amount of Funds +New Spending Proposal Deletion Rules +Bugs Fixes for Offline Functionality +-------------------------------- +v1.0.2 +-------------------------------- +Copay is now out of beta! We've spent eight months testing Copay, and we're production-ready. +-------------------------------- +v1.0.1 +-------------------------------- +Better handling of network interruption errors +Better refresh logic after accepting/rejecting payments +Updates ES, JP and FR translations +Fix scroll with in certain popups +-------------------------------- diff --git a/appstore_es b/appstore_es new file mode 100644 index 000000000..d3abac92c --- /dev/null +++ b/appstore_es @@ -0,0 +1,42 @@ +-------------------------------- +Google Play store description +-------------------------------- +Asegura tus bitcoin con tus propias reglas con el monedero de código abierto, multifirma de BitPay. + +Los usuario de Copay pueden mantener sus fondos individuales o compartir sus finanzas de forma segura con otros usuarios utilizando monederos multifirmas, que previenen de pagos sin autorización al requerir múltiples aprobaciones. Estas son algunas formas en que puede ser utilizado Copay con otros usuarios: + +Ahorrar para vacaciones o compras conjuntas con amigos +Controlar los gastos familiares +Manejar los fondos y gastos de negocios, clubes y organizaciones. + +Construimos las siguientes características en esta versión de Copay que no compromete la seguridad ni la accesibilidad: + +Creación y manejo de múltiples monederos dentro de la misma aplicación +Seguridad multifirma intuitiva para monederos personales y compartidos +Sencillo flujo de propuesta de gastos para monederos compartidos y grupos de pagos +Generación de direcciones HD (Hierarchical deterministic) y copias de seguridad +Seguridad basada en el dispositivo: todas las claves privadas se guardan localmente, no en la nube +Soporta monederos bitcoin en testnet +Acceso sincrónico desde las principales plataformas móviles y de escritorio +Soporte al protocolo de pago (BIP70-BIP73): solicitudes de pagos fácilmente identificable y verificables como pago seguro en bitcoin +Soporte a más de 150 precios de monedas y unidades de denominación en BTC o bits +Notificaciones por email de pagos y transferencias +Monederos con nombres y colores de fondo personalizables +4 idiomas soportados (EN, JP, FR, ES) + +Copay es un software gratuito y de código abierto que funciona en servidores no-propietarios, por lo que no es necesario confiar en una empresa para soporte continuo. Cualquier persona puede revisar y contribuir al código fuente de Copay en GitHub (https://github.com/bitpay/copay). + +-------------------------------- +Google Play store Release Notes: "What's new" +-------------------------------- +v1.0.2 +-------------------------------- +¡Copay esta fuera de beta! Estuvimos ocho meses probando Copay, y ahora estamos listos en producción. +-------------------------------- +v1.0.1 +-------------------------------- +Mejor manejo de errores en interrupciones de la red +Mejor lógica de actualización luego de aceptar/rechazar pagos +Actualiza traducciones en ES, JR y FR. +Corrige el desplazamiento en algunas ventanas emergentes +-------------------------------- diff --git a/appstore_fr b/appstore_fr new file mode 100644 index 000000000..25bef46da --- /dev/null +++ b/appstore_fr @@ -0,0 +1,52 @@ +-------------------------------- +Google Play store description +-------------------------------- +Sécurisez vos bitcoins selon vos conditions avec un portefeuille open source et multi-signatures par BitPay. +Les utilisateurs de Copay peuvent détenir leurs fonds de manière individuelle, ou partager leurs finances de manière sécurisée avec les autres utilisateurs en utilisant des portefeuilles multi-signatures, ce qui empêche les paiements non autorisés en exigeant des approbations multiples. +Voici quelques exemples d'utilisation que vous pouvez avoir avec Copay et avec d'autres utilisateurs : + +• Économiser pour des vacances ou partager des frais avec des amis. +• Suivre des dépenses et remboursements familiaux. +• Gérer des fonds et des dépenses pour une entreprise, un club ou une organisation. + +Nous avons développé les fonctionnalités suivantes dans cette version de Copay pour un portefeuille bitcoin qui ne fait pas de compromis sur la sécurité ou sur l'accessibilité : + +• Création et gestion de portefeuilles multiples. +• Sécurité de multi-signatures intuitive pour les portefeuilles personnels ou partagés. +• Demande de paiement facile pour les portefeuilles partagés et pour les paiements de groupe. +• Génération d'adresse déterministe hiérarchique (HD) et sauvegardes de portefeuilles. +• Sécurité basée sur l'appareil : toutes les clés privées sont stockées localement, pas dans le cloud. +• Prise en charge des portefeuilles bitcoin testnet. +• Accès synchrone sur toutes les principales plateformes mobiles et de bureau. +• Prise en charge de Payment protocol (BIP70-BIP73) : demandes de paiement facilement identifiables et paiements bitcoins sécurisés et vérifiables. +• Prise en charge de plus de 150 devises et dénomination d'unité en BTC ou en bits. +• Notifications e-mail pour les paiements et les transferts. +• Nom de portefeuille et couleurs de fond personnalisables. +• 4 langues prises en charge (EN, JP, FR, ES). + +Copay est un logiciel gratuit et open source qui tourne sur des serveurs non-propriétaires, il n'y a donc pas besoin de compter sur une entreprise pour un support continuel. N'importe qui peut examiner ou contribuer au code source de Copay sur GitHub (https://github.com/bitpay/copay). + +-------------------------------- +Google Play store Release Notes: "What's new" +-------------------------------- +v1.1.0 +-------------------------------- +• Code QR avec montant personnalisable pour recevoir des paiements. +• Transfert de fonds entre portefeuilles. +• Notifications e-mail HTML. +• Frais de transactions personnalisables. +• Possibilité d'envoyer le montant maximal des fonds disponibles. +• Nouvelles règles de suppression des propositions de dépenses. +• Corrections de bugs pour les fonctionnalités hors ligne. +-------------------------------- +v1.0.2 +-------------------------------- +Copay est sorti de sa phase beta ! Nous avons passé huit mois à tester Copay, et nous sommes prêts pour sa mise en production. +-------------------------------- +v1.0.1 +-------------------------------- +Meilleur traitement des erreurs d'interruption réseau +Meilleure logique de rafraichissement après l'acceptation/le rejet de paiements +Mise à jour des traductions ES, JP et FR +Corrige le défilement dans certaines pop-ups +-------------------------------- diff --git a/appstore_ja b/appstore_ja new file mode 100644 index 000000000..992159111 --- /dev/null +++ b/appstore_ja @@ -0,0 +1,52 @@ +-------------------------------- +Google Play store description +-------------------------------- +ビットコインにおける高度なセキュリティーを手軽に扱えるオープンソースマルチシグネチャウォレットです。 +Copayは個人のご利用はもちろんのこと、複数人によるウォレット管理の権限分散も簡単なウォレットソフトを通してご活用いただけます。 + +例えば： +友達との旅行や買い物のために透明性抜群の環境で貯蓄したい時 +家族のお小遣いや日常の家計簿管理がしたい時 +ビジネス・クラブ・団体の資金や財産管理を透明な管理分散がしたい時 + +下記の機能でセキュリティーも利便性も妥協しない最高のウォレットをCopayでご提供させていただきました： + +■ 複数のウォレットの作成・管理がアプリ内で管理可能 +■ マルチシグネチャのウォレット分散管理でも個人ウォレットでも使いやすさ抜群 +■ 送金の提案・承認・却下の流れが非常に直感的で分散管理が簡単 +■ 階級的決定性ウォレット(HDウォレット)でアドレス生成とバックアップ管理をしているためバックアップは永久に各参加者1回ずつのみ +■ 端末に依存するセキュリティー、秘密鍵が全て端末に保管され、サーバに送ることは無い +■ ビットコインの開発テスト用ネットワークにも対応 +■ メジャーなプラットフォーム全てに対応 (Windows, Mac, Linux, Android, iPhone, Windows Phone) +■ ペイメントプロトコルにも対応(BIP 70-73)、暗号通信と証明書を使ったマーチャントとの安全なペイメントの実現 +■ 世界中の150個以上の通貨の表示に対応、自国通貨との為替レートを計算する必要なし。ビットコインの単位も BTC と bits にも対応 +■ ペイメントや提案のメール通知も可能 +■ ウォレットごとの背景色設定や通称設定も可能でカスタマイズ性抜群 +■ 4ヶ国語に対応 (英日仏西) + +Copayは永久無料でオープンソースのソフトです。サーバーもオープンソースなので、独自運用や法人の利用やソース流用は許可します。ソースをご覧の際に間違いなどが見つかった場合、Githubにてご報告・ソース修正のプルリクエストなどをお願いします。(https://github.com/bitpay/copay) + +-------------------------------- +Google Play store Release Notes: "What's new" +-------------------------------- +v1.1.0 +-------------------------------- +■ QRコードによる指定額の受取要請。 +■ ウォレット間の送金が円滑に。 +■ メール通知のHTML化。 +■ ビットコインネットワーク手数料が指定可能に。 +■ ボタン一つで全残高を一気に送金が可能に。 +■ 送金の提案の取下げ条件の変更。 +■ オフライン機能のバグ修正。 +-------------------------------- +v1.0.2 +-------------------------------- +Copayがようやくベータ版を抜けてリリース版になりました！ 8ヶ月の時間を掛けて品質テストしてきたので、皆さんに安全に使っていただけるようになりました！ +-------------------------------- +v1.0.1 +-------------------------------- +ネットワーク接続エラーの処理改善 +送金の提案を承諾・却下した後の更新ロジックを改善 +スペイン語、日本語、フランス語の翻訳を更新 +特定のポップアップにおけるスクロール問題を改善 +-------------------------------- diff --git a/appstore_pt b/appstore_pt new file mode 100644 index 000000000..39fee8183 --- /dev/null +++ b/appstore_pt @@ -0,0 +1,41 @@ +-------------------------------- +Google Play store description +-------------------------------- +Armazene bitcoin com seus próprios termos com uma carteira de multi-assinaturas, open source, do BitPay. +Usuários Copay podem manter fundos individualmente ou compartilhar finanças seguramente com outros usuários por meio de carteiras multi-assinadas, que previnem pagamentos não autorizados por meio de múltiplas aprovações. Algumas formas que a Copay pode ser usada com outros: + +Para economizar para férias ou juntar compras com amigos +Para rastrear despesas familiares e To track family spending and descontos +Para gerenciar negócios, clube ou organizar saldos e despesas + +Nós construímos as seguintes funcionalidades nesta versão da Copay para uma carteira bitcoin que não comprometa segurança ou acessibilidade: + +Criação de múltiplas carteiras com gerenciamento no aplicativo +Segurança de multi-assinaturas intuitiva para carteiras pessoais ou compartilhadas +Fácil fluxo de propostas de gastos para carteiras compartilhadas e pagamentos agrupados +Geração de endereço Hierarchical deterministic (HD) e backups de carteiras +Segurança baseada em dispositivo: todas as chaves privadas são armazenadas localmente e não na nuvem +Suporte para carteiras de testes na Bitcoin testnet +Acesso síncrono entre todas as principais plataformas móveis e desktops +Suporte a protocolo de pagamento (BIP70-BIP73): solicitações de pagamento facilmente identificadas e pagamentos seguros em bitcoins verificáveis +Suporte para mais de 150 opções de moedas e denominação de unidades em BTC ou bits +Notificações por e-mail para pagamentos e transferências +Nomes e cores de fundo customizáveis para carteiras +5 idiomas suportados (EN, JP, FR, ES, PT-BR) + +Copay é gratuito e um software livre rodando em servidores não-proprietários, que não precisa de nenhuma empresa para o suporte contínuo. Qualquer um pode revisar ou contribuir para o código-fonte da Copay no GitHub (https://github.com/bitpay/copay). + +-------------------------------- +Google Play store Release Notes: "What's new" +-------------------------------- +v1.0.2 +-------------------------------- +Copay agora está fora do beta! Nós gastamos oito meses testando a Copay e estamos prontos para entrar em produção. +-------------------------------- +v1.0.1 +-------------------------------- +Melhoria no tratamento de erros de interrupção de rede +Melhoria no lógica de renovação após aceitar/rejeitar pagamentos +Atualização das traduções para ES, JP e FR +Resolvida rolagem de certos popups +-------------------------------- diff --git a/atom-shell.md b/atom-shell.md deleted file mode 100644 index 0807918fb..000000000 --- a/atom-shell.md +++ /dev/null @@ -1,67 +0,0 @@ - -# Warning - -This NEEDS to be updated. - -## Running in the Native Shell - -Copay can be executed from within a "native" application shell, providing some -additional features such as native menus, notifications, tray integration, etc. -This is accomplished using [Atom Shell](https://github.com/atom/atom-shell). - -To run and test Copay from within this context, first download the atom-shell -package to `shell/bin/{platform}` (ignored by git), by running: - -``` -npm run setup-shell -``` - -Once this script has completed, you can launch the shell-based Copay by running: - -``` -npm run shell -``` - -## Building Native Shell Binaries/Installers (OSX) - -``` -npm run dist -``` - -This script will download atom shell binaries and combine them with Copay sources -to build a DMG for osx-x64, an installer EXE for win32, and a .tar.gz for linux-x64. -It was developed to be run on OSX. The outputs are copied to the dist directory. - -DMG is created with hdiutil -EXE is created with makensis (brew install makensis) - - -# Development - -## Native Shell - -To add features that enhance the native experience of Copay, first follow the -directions above under "Running in the Native Shell". It's important to ensure -that functionality within this context should either hook into existing features -or supplement the experience of those features. Copay should continue to operate -full-featured from within a modern web browser. - -Shell functionality works by sending and receiving messages between the Copay -application and the shell wrapper. Native functionality should be handled mostly -from within `shell/lib/message-handler.js`, which receives messages conditionally -from the front-end Angular controllers. - -Look at `js/shell.js` to see how we determine if Copay is running from within the -native shell context. If we are running within the shell, Copay has access to the -global variable `window.cshell`, which provides access to the messenger. For -instance, to Copay might want to use a native dialog alert in favor of a regular -one if running in this context. You would do this like so: - -```js -if (window.cshell) { - window.cshell.send('alert', 'info', 'Please select a wallet.'); -} -else { - window.alert('Please select a wallet.'); -} -``` diff --git a/bower.json b/bower.json index a924bcb97..e13a87001 100644 --- a/bower.json +++ b/bower.json @@ -4,7 +4,7 @@ "copay", "wallet", "multisignature", - "bircore" + "bitcore" ], "dependencies": { "angular": "~1.3.13", @@ -15,8 +15,9 @@ "foundation": "zurb/bower-foundation#~5.5.1", "foundation-icon-fonts": "*", "ng-lodash": "~0.2.0", - "angular-moment": "~0.9.0", - "angular-bitcore-wallet-client": "^0.0.21", + "angular-moment": "~0.10.1", + "moment": "~2.10.3", + "angular-bitcore-wallet-client": "^0.0.26", "angular-ui-router": "~0.2.13", "qrcode-decoder-js": "*", "fastclick": "*", diff --git a/cordova/android/res/drawable-hdpi/copay.png b/cordova/android/res/drawable-hdpi/icon.png similarity index 100% rename from cordova/android/res/drawable-hdpi/copay.png rename to cordova/android/res/drawable-hdpi/icon.png diff --git a/cordova/android/res/drawable-ldpi/copay.png b/cordova/android/res/drawable-ldpi/icon.png similarity index 100% rename from cordova/android/res/drawable-ldpi/copay.png rename to cordova/android/res/drawable-ldpi/icon.png diff --git a/cordova/android/res/drawable-mdpi/copay.png b/cordova/android/res/drawable-mdpi/icon.png similarity index 100% rename from cordova/android/res/drawable-mdpi/copay.png rename to cordova/android/res/drawable-mdpi/icon.png diff --git a/cordova/android/res/drawable-port-hdpi/copayscreen.png b/cordova/android/res/drawable-port-hdpi/copayscreen.png new file mode 100644 index 000000000..784d90611 Binary files /dev/null and b/cordova/android/res/drawable-port-hdpi/copayscreen.png differ diff --git a/cordova/android/res/drawable-port-ldpi/copayscreen.png b/cordova/android/res/drawable-port-ldpi/copayscreen.png new file mode 100644 index 000000000..55e3d8e58 Binary files /dev/null and b/cordova/android/res/drawable-port-ldpi/copayscreen.png differ diff --git a/cordova/android/res/drawable-port-mdpi/copayscreen.png b/cordova/android/res/drawable-port-mdpi/copayscreen.png new file mode 100644 index 000000000..800aa23ef Binary files /dev/null and b/cordova/android/res/drawable-port-mdpi/copayscreen.png differ diff --git a/cordova/android/res/drawable-port-xhdpi/copayscreen.png b/cordova/android/res/drawable-port-xhdpi/copayscreen.png new file mode 100644 index 000000000..db9f7a48f Binary files /dev/null and b/cordova/android/res/drawable-port-xhdpi/copayscreen.png differ diff --git a/cordova/android/res/drawable-xhdpi/copay.png b/cordova/android/res/drawable-xhdpi/icon.png similarity index 100% rename from cordova/android/res/drawable-xhdpi/copay.png rename to cordova/android/res/drawable-xhdpi/icon.png diff --git a/cordova/android/res/drawable/copayscreen.9.png b/cordova/android/res/drawable/copayscreen.9.png deleted file mode 100644 index a47c06e84..000000000 Binary files a/cordova/android/res/drawable/copayscreen.9.png and /dev/null differ diff --git a/cordova/android/res/drawable/copay.png b/cordova/android/res/drawable/icon.png similarity index 100% rename from cordova/android/res/drawable/copay.png rename to cordova/android/res/drawable/icon.png diff --git a/cordova/build.sh b/cordova/build.sh index 9858c897f..628837944 100755 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -163,8 +163,8 @@ if [ $CURRENT_OS == "ANDROID" ]; then mkdir -p $PROJECT/platforms/android/res/xml/ checkOK - cp android/AndroidManifest.xml $PROJECT/platforms/android/AndroidManifest.xml - checkOK +# cp android/AndroidManifest.xml $PROJECT/platforms/android/AndroidManifest.xml +# checkOK cp android/project.properties $PROJECT/platforms/android/project.properties checkOK diff --git a/cordova/config.xml b/cordova/config.xml index 2cf53f529..40e873480 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="1.1.1" + android-versionCode="38" + ios-CFBundleVersion="1.1.1"> Copay A secure bitcoin wallet for friends and companies. @@ -14,7 +14,6 @@ - @@ -26,19 +25,4 @@ - - - - - - - - - - - - - - - diff --git a/cordova/ios/Copay-Info.plist b/cordova/ios/Copay-Info.plist index ed10e0e31..76ff152b7 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.10.7 + 1.1.1 CFBundleSignature ???? CFBundleVersion - 0.10.7 + 1.1.1 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/ios/splash/Default-568h@2x~iphone.png b/cordova/ios/splash/Default-568h@2x~iphone.png index 62bf54650..9174abe81 100644 Binary files a/cordova/ios/splash/Default-568h@2x~iphone.png and b/cordova/ios/splash/Default-568h@2x~iphone.png differ diff --git a/cordova/ios/splash/Default-667h.png b/cordova/ios/splash/Default-667h.png index ba02850ca..b64cf0aa5 100644 Binary files a/cordova/ios/splash/Default-667h.png and b/cordova/ios/splash/Default-667h.png differ diff --git a/cordova/ios/splash/Default-736h.png b/cordova/ios/splash/Default-736h.png index 050cedbcc..3ab52f2bb 100644 Binary files a/cordova/ios/splash/Default-736h.png and b/cordova/ios/splash/Default-736h.png differ diff --git a/cordova/ios/splash/Default-Landscape-736h.png b/cordova/ios/splash/Default-Landscape-736h.png index 4f68a39ea..233742363 100644 Binary files a/cordova/ios/splash/Default-Landscape-736h.png and b/cordova/ios/splash/Default-Landscape-736h.png differ diff --git a/cordova/ios/splash/Default-Landscape@2x~ipad.png b/cordova/ios/splash/Default-Landscape@2x~ipad.png index 54961f811..1ddf77b44 100644 Binary files a/cordova/ios/splash/Default-Landscape@2x~ipad.png and b/cordova/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/cordova/ios/splash/Default-Landscape~ipad.png b/cordova/ios/splash/Default-Landscape~ipad.png index d457fa2bf..1988bcd89 100644 Binary files a/cordova/ios/splash/Default-Landscape~ipad.png and b/cordova/ios/splash/Default-Landscape~ipad.png differ diff --git a/cordova/ios/splash/Default-Portrait@2x~ipad.png b/cordova/ios/splash/Default-Portrait@2x~ipad.png index 879f981e3..2fbffbfd2 100644 Binary files a/cordova/ios/splash/Default-Portrait@2x~ipad.png and b/cordova/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/cordova/ios/splash/Default-Portrait~ipad.png b/cordova/ios/splash/Default-Portrait~ipad.png index 540c54f9e..27cc0bdb1 100644 Binary files a/cordova/ios/splash/Default-Portrait~ipad.png and b/cordova/ios/splash/Default-Portrait~ipad.png differ diff --git a/cordova/ios/splash/Default@2x~iphone.png b/cordova/ios/splash/Default@2x~iphone.png index ed48409a9..253cbf208 100644 Binary files a/cordova/ios/splash/Default@2x~iphone.png and b/cordova/ios/splash/Default@2x~iphone.png differ diff --git a/cordova/ios/splash/Default~iphone.png b/cordova/ios/splash/Default~iphone.png index 1499ac825..d871d9168 100644 Binary files a/cordova/ios/splash/Default~iphone.png and b/cordova/ios/splash/Default~iphone.png differ diff --git a/cordova/ios/splash/Rectangle 1.png b/cordova/ios/splash/Rectangle 1.png index 22287b835..2fbffbfd2 100644 Binary files a/cordova/ios/splash/Rectangle 1.png and b/cordova/ios/splash/Rectangle 1.png differ diff --git a/cordova/ios/splash/Rectangle 1@2x.png b/cordova/ios/splash/Rectangle 1@2x.png index 6e45f0e8e..45af4c922 100644 Binary files a/cordova/ios/splash/Rectangle 1@2x.png and b/cordova/ios/splash/Rectangle 1@2x.png differ diff --git a/cordova/wp/Assets/SplashScreen.png b/cordova/wp/Assets/SplashScreen.png index 1c9b8c17b..cb5a52389 100644 Binary files a/cordova/wp/Assets/SplashScreen.png and b/cordova/wp/Assets/SplashScreen.png differ diff --git a/cordova/wp/Assets/WideLogo.png b/cordova/wp/Assets/WideLogo.png index 9f4bd6277..bf104ae25 100644 Binary files a/cordova/wp/Assets/WideLogo.png and b/cordova/wp/Assets/WideLogo.png differ diff --git a/cordova/wp/Background.png b/cordova/wp/Background.png index 31f4d63d3..5fd762d99 100755 Binary files a/cordova/wp/Background.png and b/cordova/wp/Background.png differ diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index f07923a97..1c41b0ece 100644 --- a/cordova/wp/Package.appxmanifest +++ b/cordova/wp/Package.appxmanifest @@ -1,6 +1,6 @@  - + Copay Wallet diff --git a/cordova/wp/SplashScreenImage-original.jpg b/cordova/wp/SplashScreenImage-original.jpg old mode 100755 new mode 100644 index 4942eaf03..b25cf2851 Binary files a/cordova/wp/SplashScreenImage-original.jpg and b/cordova/wp/SplashScreenImage-original.jpg differ diff --git a/cordova/wp/SplashScreenImage.jpg b/cordova/wp/SplashScreenImage.jpg old mode 100755 new mode 100644 index 15a010996..69bda60a2 Binary files a/cordova/wp/SplashScreenImage.jpg and b/cordova/wp/SplashScreenImage.jpg differ diff --git a/package.json b/package.json index 3562867ed..001cd1c24 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "0.10.7", + "version": "1.1.1", "keywords": [ "wallet", "copay", @@ -10,7 +10,23 @@ "bitcoin", "bitcore" ], - "main": "app.js", + "main": "public/index.html", + "window": { + "toolbar": false, + "show": true, + "visible": true, + "resizable": false, + "frame": true, + "width": 400, + "height": 600, + "position": "center", + "fullscreen": false + }, + "webkit": { + "page-cache": false, + "java": false, + "plugin": false + }, "id": "jid1-x7bV5evAaI1P9Q", "homepage": "https://github.com/bitpay/copay", "license": "MIT", @@ -43,8 +59,11 @@ "devDependencies": { "angular": "^1.3.14", "angular-mocks": "^1.3.14", + "grunt-contrib-compress": "^0.13.0", + "grunt-contrib-copy": "^0.8.0", "grunt-karma": "^0.10.1", "grunt-karma-coveralls": "^2.5.3", + "grunt-node-webkit-builder": "^1.0.2", "karma": "^0.12.31", "karma-cli": "0.0.4", "karma-coverage": "^0.2.7", diff --git a/po/de.po b/po/de.po new file mode 100644 index 000000000..8f0d5e41f --- /dev/null +++ b/po/de.po @@ -0,0 +1,1112 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Project-Id-Version: Copay\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Sascha Dückers \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"X-Generator: Poedit 1.8.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: de\n" + +#: public/views/modals/txp-details.html +msgid "" +"* Only payment proposals created by yourself with no peer actions can be " +"removed" +msgstr "" +"* Es können nur eigene Zahlungsvorschläge ohne Peer-Aktionen entfernt werden" + +#: public/views/backup.html +msgid "" +"* You can safely install your backup on another device and use your wallet " +"from multiple devices at the same time." +msgstr "" +"* Das Backup kann sicher auf anderen Geräten installiert und das Wallet von " +"mehreren Geräten gleichzeitig verwendet werden." + +#: public/views/splash.html +msgid "A multisignature bitcoin wallet" +msgstr "Ein Bitcoin Wallet mit Mehrfachunterschriften" + +#: public/views/preferences.html +msgid "About Copay" +msgstr "Über Copay" + +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "Akzeptieren" + +#: public/views/includes/sidebar.html +msgid "Add wallet" +msgstr "Wallet hinzufügen" + +#: public/views/paymentUri.html public/views/modals/paypro.html +msgid "Address" +msgstr "Adresse" + +#: public/views/preferences.html +msgid "Advanced" +msgstr "Erweitert" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "Alias für {{index.walletName}}" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "Existiert bereits ein Wallet?" + +#: public/views/preferences.html +msgid "Alternative Currency" +msgstr "Alternative Währung" + +#: public/views/paymentUri.html public/views/walletHome.html +#: public/views/modals/txp-details.html +msgid "Amount" +msgstr "Betrag" + +#: public/views/walletHome.html +msgid "Amount in" +msgstr "Betrag in" + +#: public/views/preferencesLanguage.html +msgid "Applying changes" +msgstr "Änderungen anwenden" + +#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +msgid "Are you sure you want to delete this wallet?" +msgstr "Soll das Wallet wirklich gelöscht werden?" + +#: public/views/walletHome.html +msgid "Available Balance" +msgstr "Verfügbarer Gesamtbetrag" + +#: public/views/create.html public/views/join.html +msgid "BIP32 master extended private key" +msgstr "BIP32 erweiterter privater Hauptschlüssel" + +#: public/views/includes/topbar.html public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Back" +msgstr "Zurück" + +#: public/views/preferences.html +msgid "Backup" +msgstr "Sicherung" + +#: src/js/controllers/backup.js +msgid "Backup created" +msgstr "Sicherung erstellt" + +#: public/views/walletHome.html +msgid "Backup now" +msgstr "Jetzt sichern" + +#: public/views/backup.html +msgid "Backup options" +msgstr "Sicherungseinstellungen" + +#: public/views/walletHome.html +msgid "" +"Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "" +"Bevor Beträge empfangen werden, wird dringend empfohlen die Wallet Schlüssel " +"zu sichern." + +#: public/views/paymentUri.html +msgid "Bitcoin URI is NOT valid!" +msgstr "Bitcoin URI ist NICHT gültig!" + +#: public/views/walletHome.html +msgid "Bitcoin address" +msgstr "Bitcoinadresse" + +#: public/views/modals/txp-details.html +msgid "Broadcast Payment" +msgstr "Zahlung übermitteln" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Übermittlung der Zahlung" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting transaction" +msgstr "Übermittlung der Transaktion" + +#: public/views/unsupported.html +msgid "Browser unsupported" +msgstr "Der eingesetzte Browser wird nicht unterstützt" + +#: public/views/modals/txp-details.html +msgid "But not broadcasted. Try to send manually" +msgstr "Aber nicht übermittelt. Bitte manuelle Übermittlung versuchen" + +#: public/views/includes/password.html +msgid "CANCEL" +msgstr "ABBRUCH" + +#: public/views/copayers.html public/views/walletHome.html +msgid "Cancel" +msgstr "Abbruch" + +#: public/views/modals/paypro.html +msgid "Certified by" +msgstr "Zertifiziert von" + +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "" +"Änderung der Aliases hat nur Auswirkungen auf den lokalen Namen des Wallets" + +#: src/js/controllers/walletHome.js +msgid "Check you connection and try again" +msgstr "Bitte die Verbindung prüfen und erneut probieren" + +#: public/views/import.html +msgid "Choose a backup file from your computer" +msgstr "Bitte eine Sicherungsdatei vom Computer wählen" + +#: public/views/includes/topbar.html public/views/modals/copayers.html +#: public/views/modals/paypro.html public/views/modals/scanner.html +msgid "Close" +msgstr "Schließen" + +#: public/views/preferences.html +msgid "Color" +msgstr "Farbe" + +#: public/views/preferencesAbout.html +msgid "Commit hash" +msgstr "Hash übertragen" + +#: public/views/modals/tx-details.html +msgid "Confirmations" +msgstr "Bestätigungen" + +#: public/views/modals/copayers.html +msgid "Copayers" +msgstr "Copayers" + +#: public/views/backup.html +msgid "Copy backup to a safe place" +msgstr "Sicherung an einen sicheren Ort kopieren" + +#: public/views/backup.html +msgid "Copy this text as it is to a safe place (notepad or email)" +msgstr "Diesen Text an einem sichern Ort einfügen (Notepad oder E-Mail)" + +#: public/views/backup.html +msgid "Copy to clipboard" +msgstr "In die Zwischenablage kopieren" + +#: src/js/controllers/walletHome.js +msgid "Could not accept payment. Check you connection and try again" +msgstr "" +"Zahlung konnte nicht angenommen werden. Bitte die Verbindung überprüfen und " +"erneut versuchen" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment. Check you connection and try again" +msgstr "" +"Zahlung kann nicht übermittelt werden. Bitte die Verbindung prüfen und " +"erneut probieren" + +#: src/js/controllers/walletHome.js +msgid "" +"Could not connect wallet service. Check your Internet connexion and your " +"wallet service configuration." +msgstr "" +"Kann keine Verbindung zum Wallet Service aufgebaut werden. Bitte die " +"Internetverbindung und die Wallet Service Einstellung überprüfen." + +#: src/js/controllers/walletHome.js +msgid "Could not create address. Check you connection and try again" +msgstr "" +"Es kann keine Adresse erzeugt werden. Bitte Verbindung prüfen und erneut " +"versuchen" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "Es kann kein Zahlungsvorschlag erzeugt werden" + +#: src/js/services/profileService.js +msgid "Could not create using the specified extended private key" +msgstr "Erzeugung mit erweiterten privaten Schlüssel nicht möglich" + +#: src/js/controllers/import.js +msgid "Could not decrypt file, check your password" +msgstr "Datei kann nicht entschlüsselt werden, bitte das Passwort überprüfen" + +#: src/js/controllers/walletHome.js +msgid "Could not delete payment proposal. Check you connection and try again" +msgstr "" +"Die Zahlungsanweisung kann nicht gelöscht werden. Bitte Verbindung prüfen " +"und erneut probieren" + +#: src/js/controllers/walletHome.js +msgid "Could not fetch payment information" +msgstr "Zahlungsinformationen können nicht abgerufen werden" + +#: public/views/walletHome.html +msgid "Could not fetch transaction history" +msgstr "Transaktionshistorie kann nicht abgerufen werden" + +#: src/js/services/profileService.js +msgid "Could not import. Check input file and password" +msgstr "Import nicht möglich. Bitte Datei und Passwort überprüfen" + +#: src/js/services/profileService.js +msgid "Could not join using the specified extended private key" +msgstr "" +"Teilnahme mit spezifizierten erweiterten privaten Schlüssel nicht möglich" + +#: src/js/controllers/join.js +msgid "Could not join wallet:" +msgstr "Beteiligung am Wallet nicht möglich" + +#: src/js/controllers/walletHome.js +msgid "Could not reject payment. Check you connection and try again" +msgstr "" +"Zahlung kann nicht abgelehnt werden. Bitte Verbindung prüfen und erneut " +"versuchen" + +#: src/js/controllers/walletHome.js +msgid "Could not send payment" +msgstr "Zahlung kann nicht gesendet werden" + +#: public/views/walletHome.html +msgid "Could not update Wallet" +msgstr "Wallet kann nicht aktualisiert werden" + +#: public/views/walletHome.html +msgid "Create" +msgstr "Erzeugen" + +#: public/views/add.html +msgid "Create new wallet" +msgstr "Neues Wallet erzeugen" + +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "Ein {{requiredCopayers}}-von-{{totalCopayers}} Wallet erzeugen" + +#: public/views/includes/sidebar.html +msgid "Create, join or import" +msgstr "NEU | TEILNAHME | IMPORT" + +#: public/views/modals/txp-details.html +msgid "Created by" +msgstr "Erstellt von" + +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Profil erstellen..." + +#: public/views/create.html +msgid "Creating Wallet..." +msgstr "Wallet erstellen..." + +#: src/js/controllers/walletHome.js +msgid "Creating transaction" +msgstr "Transaktion erstellen" + +#: public/views/modals/tx-details.html +msgid "Date" +msgstr "Datum" + +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Zahlungsvorschlag löschen" + +#: public/views/preferencesAdvanced.html +msgid "Delete Wallet" +msgstr "Wallet löschen" + +#: public/views/copayers.html +msgid "Delete it and create a new one" +msgstr "Löschen und neues Wallet erzeugen" + +#: public/views/preferencesDeleteWallet.html +msgid "Delete wallet" +msgstr "Wallet löschen" + +#: src/js/controllers/walletHome.js +msgid "Deleting payment" +msgstr "Zahlung löschen" + +#: public/views/modals/paypro.html public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "Details" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Deaktiviert" + +#: public/views/backup.html +msgid "Download backup" +msgstr "Download der Sicherung " + +#: public/views/includes/password.html +msgid "ENTER" +msgstr "ENTER" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Benachrichtigunen per E-Mail" + +#: public/views/preferences.html +msgid "Encrypt Private Key" +msgstr "Verschlüsselung des privaten Schlüssels" + +#: src/js/controllers/backup.js +msgid "Encrypted backup file saved" +msgstr "Verschlüsselte Sicherungsdatei wurde gespeichert" + +#: src/js/controllers/index.js +msgid "English" +msgstr "English" + +#: public/views/includes/password.html +msgid "Enter your password" +msgstr "Passwort eingeben" + +#: src/js/services/profileService.js +msgid "Error creating wallet" +msgstr "Fehler beim Erstellen des Wallets" + +#: src/js/services/profileService.js +msgid "Error creating wallet. Check your internet connection" +msgstr "Fehler beim Erstellen des Wallets. Bitte die Internetverbindung prüfen" + +#: src/js/services/profileService.js +msgid "Error importing wallet:" +msgstr "Fehler beim Import des Wallets" + +#: public/views/modals/paypro.html public/views/modals/txp-details.html +msgid "Expires" +msgstr "Gültig bis" + +#: src/js/controllers/importLegacy.js +msgid "Failed to import wallets" +msgstr "Import des Wallets fehlgeschlagen" + +#: public/views/create.html +msgid "Family vacation funds" +msgstr "Familienurlaub" + +#. Get information of payment if using Payment Protocol +#: src/js/controllers/walletHome.js +msgid "Fetching Payment Information" +msgstr "Zahlungsinformationen abrufen" + +#: src/js/controllers/index.js +msgid "French" +msgstr "Français" + +#: src/js/services/notificationsService.js +msgid "Funds received" +msgstr "Beträge empfangen" + +#: public/views/splash.html +msgid "GET STARTED" +msgstr "JETZT STARTEN" + +#: public/views/walletHome.html +msgid "Generate new address" +msgstr "Neue Adresse erzeugen" + +#: public/views/preferences.html +msgid "Global settings" +msgstr "Globale Einstellungen" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Ist eine Copay v0.9 Sicherung vorhanden" + +#: public/views/create.html public/views/join.html +msgid "Hide Advanced options" +msgstr "Erweiterte Optionen ausblenden" + +#: src/js/controllers/index.js +msgid "History" +msgstr "Historie" + +#: src/js/controllers/index.js +msgid "Home" +msgstr "Start" + +#: public/views/create.html public/views/join.html +msgid "If not given, a secure key will be generated" +msgstr "Sofern nicht angegeben, wird ein sicherer Schlüssel erzeugt " + +#: public/views/importLegacy.html +msgid "Import" +msgstr "Import" + +#: public/views/import.html public/views/splash.html +msgid "Import backup" +msgstr "Importiere Sicherung" + +#: public/views/importLegacy.html +msgid "Import from the Cloud?" +msgstr "Aus der Cloud importieren" + +#: public/views/import.html +msgid "Import here" +msgstr "Hier importieren" + +#: public/views/add.html +msgid "Import wallet" +msgstr "Wallet importieren" + +#: public/views/import.html +msgid "Importing wallet..." +msgstr "Wallet wird importiert..." + +#: public/views/importLegacy.html +msgid "Importing..." +msgstr "Importiere..." + +#: src/js/controllers/index.js +msgid "Japanese" +msgstr "日本語" + +#: public/views/create.html public/views/join.html +msgid "John" +msgstr "Sascha" + +#: public/views/join.html +msgid "Join" +msgstr "Teilnehmen" + +#: public/views/add.html +msgid "Join shared wallet" +msgstr "Gemeinschaftliches Wallet" + +#: public/views/join.html +msgid "Joining Wallet..." +msgstr "Teilnahme am Wallet einrichten..." + +#: public/views/preferences.html +msgid "Language" +msgstr "Sprache" + +#: public/views/importLegacy.html +msgid "Learn more about Wallet Migration" +msgstr "Mehr über die Migration von Wallets erfahren" + +#: public/views/paymentUri.html +msgid "Make a payment to" +msgstr "Sende eine Zahlung an" + +#: public/views/create.html public/views/join.html +msgid "Master extended private key" +msgstr "Erweiterter privater Hauptschlüssel" + +#: public/views/includes/copayers.html public/views/modals/copayers.html +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "Me" +msgstr "Ich" + +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "Memo" + +#: public/views/modals/tx-details.html +msgid "Merchant message" +msgstr "Händlernachricht" + +#: public/views/paymentUri.html +msgid "Message" +msgstr "Nachricht" + +#: public/views/walletHome.html +msgid "More" +msgstr "Mehr" + +#: public/views/walletHome.html +msgid "Moved" +msgstr "Verschoben" + +#: public/views/walletHome.html +msgid "Multisignature wallet" +msgstr "Gemeinschaftliches Wallet" + +#: public/views/walletHome.html +msgid "My Bitcoin address" +msgstr "Eigene Bitcoinadresse" + +#: public/views/paymentUri.html +msgid "Network" +msgstr "Netzwerk" + +#: src/js/services/notificationsService.js +msgid "New Payment Proposal" +msgstr "Neue Zahlungsvorschlag" + +#: public/views/modals/confirmation.html +msgid "No" +msgstr "Nein" + +#: public/views/walletHome.html +msgid "No transactions yet" +msgstr "Noch keine Transaktionen" + +#: public/views/walletHome.html +msgid "Not valid" +msgstr "Nicht gültig" + +#: public/views/walletHome.html public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Note" +msgstr "Notiz" + +#: public/views/modals/tx-status.html +msgid "OKAY" +msgstr "OKAY" + +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "Participants" +msgstr "Teilnehmer" + +#: public/views/import.html public/views/importLegacy.html +msgid "Password" +msgstr "Passwort" + +#: public/views/includes/password.html +msgid "Password cannot be recovered. Be sure to write it down" +msgstr "" +"Passwort kann nicht wiederhergestellt werden. Bitte sicherheitshalber " +"notieren" + +#: src/js/services/profileService.js +msgid "Password needed" +msgstr "Passwort benötigt" + +#: src/js/controllers/password.js +msgid "Passwords do not match" +msgstr "Passwörter stimmen nicht überein" + +#: public/views/join.html +msgid "Paste invitation here" +msgstr "Einladung hier einfügen" + +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Den Klartext des Backups einfügen" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Zahle an" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "Zahlung angenommen" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Zahlungsvorschlag" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Zahlungsvorschlag erstellt" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Zahlungsvorschlag abgelehnt" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Zahlungsvorschlag wurde vom Copayer abgelehnt" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Zahlungsvorschlag wurde vom Copayer abgezeichnet" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Zahlungsvorschläge" + +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "Zahlungsprotokoll wird nicht von der Chrome App unterstützt" + +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "Zahlung abgelehnt" + +#: public/views/modals/tx-status.html src/js/services/notificationsService.js +msgid "Payment Sent" +msgstr "Zahlung gesendet" + +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "Zahlung angenommen..." + +#: public/views/modals/txp-details.html +msgid "Payment details" +msgstr "Zahlungsdetails" + +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "Zahlung endgültig abgelehnt" + +#: public/views/modals/paypro.html +msgid "Payment request" +msgstr "Zahlungsanforderung" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "Zahlung gesendet!" + +#: public/views/walletHome.html +msgid "Payment to" +msgstr "Zahlung an" + +#: public/views/preferencesDeleteWallet.html +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" +msgstr "" +"Wallet dauerhaft löschen. DIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN" + +#: public/views/create.html +msgid "Personal Wallet" +msgstr "Persönliches Wallet" + +#: src/js/controllers/create.js src/js/controllers/join.js +msgid "Please enter the required fields" +msgstr "Bitte die benötigten Felder ausfüllen" + +#: src/js/controllers/import.js +msgid "Please, select your backup file" +msgstr "Bitte die Sicherungsdatei wählen" + +#: src/js/controllers/index.js +msgid "Portuguese" +msgstr "Português" + +#: public/views/walletHome.html +msgid "Preferences" +msgstr "Einstellungen" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "QR-Scanner" + +#: src/js/controllers/index.js +msgid "Receive" +msgstr "Empfangen" + +#: public/views/walletHome.html +msgid "Received" +msgstr "Empfangen" + +#: public/views/walletHome.html +msgid "Reconnecting to Wallet Service..." +msgstr "Neuverbindung zum Wallet Service... " + +#: public/views/walletHome.html +msgid "Recreate" +msgstr "Wiederherstellen" + +#: public/views/walletHome.html +msgid "Recreating Wallet..." +msgstr "Wallet wiederherstellen..." + +#: public/views/modals/txp-details.html +msgid "Reject" +msgstr "Ablehnen" + +#: src/js/controllers/walletHome.js +msgid "Rejecting payment" +msgstr "Zahlung ablehenen" + +#: public/views/preferencesAbout.html +msgid "Release Information" +msgstr "Information zur Veröffentlichung" + +#: public/views/backup.html public/views/includes/password.html +msgid "Repeat password" +msgstr "Passwort wiederholen" + +#: public/views/import.html public/views/join.html +msgid "Required" +msgstr "Benötigt" + +#: public/views/splash.html +msgid "Retrying..." +msgstr "Neuer Versuch..." + +#: public/views/includes/password.html +msgid "SET" +msgstr "EINRICHTEN" + +#: public/views/walletHome.html +msgid "SKIP BACKUP" +msgstr "SICHERUNG ÜBERSPRINGEN" + +#: public/views/preferencesAlias.html public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html +msgid "Save" +msgstr "Speichern" + +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Speichere Einstellungen" + +#: src/js/services/notificationsService.js +msgid "Scan Finished" +msgstr "Überprüfung abgeschlossen" + +#: public/views/preferencesAdvanced.html +msgid "Scan addresses for funds" +msgstr "Adresse auf neue Beträge überprüfen" + +#: public/views/walletHome.html +msgid "Scan status finished with error" +msgstr "Überprüfung wurde mit Fehlern beendet" + +#: public/views/walletHome.html +msgid "Scanning Wallet funds..." +msgstr "Prüfe Wallet auf neue Beträge..." + +#: public/views/modals/tx-details.html +msgid "See it on the blockchain" +msgstr "Im Blockchain anzeigen" + +#: public/views/import.html +msgid "Select a backup file" +msgstr "Eine Sicherungsdatei auswählen" + +#: public/views/paymentUri.html +msgid "Select a wallet" +msgstr "Wallet wählen" + +#: public/views/create.html +msgid "Select required number of signatures" +msgstr "Bitte die benötigte Anzahl der Unterschriften wählen" + +#: public/views/create.html +msgid "Select total number of copayers" +msgstr "Bitte die Gesamtanzahl der Copayer wählen" + +#: public/views/walletHome.html public/views/includes/transaction.html +#: src/js/controllers/index.js +msgid "Send" +msgstr "Senden" + +#: public/views/backup.html public/views/preferencesLogs.html +msgid "Send by email" +msgstr "Per E-Mail versenden" + +#: public/views/walletHome.html +msgid "Sent" +msgstr "Gesendet" + +#: public/views/importLegacy.html +msgid "Server" +msgstr "Server" + +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "Sitzungsprotokoll" + +#: public/views/backup.html +msgid "Set up a Password for your backup" +msgstr "Passwort für die Sicherung einrichten" + +#: public/views/includes/password.html +msgid "Set up a password" +msgstr "Passwort einrichten" + +#: public/views/preferencesEmail.html +msgid "" +"Setting up email notifications could weaken your privacy, if the wallet " +"service provider is compromised. Information available to an attacker would " +"include your wallet addresses and its balance, but no more." +msgstr "" +"Das Einrichten einer E-Mail Benachrichtigung schwächt die Privatsphäre, wenn " +"der Wallet Service Anbieter kompromittiert wurde. Der Angreifer kann jedoch " +"nur Wallet Adresse und Guthaben erfahren, mehr nicht." + +#: public/views/walletHome.html +msgid "Share address" +msgstr "Adresse teilen" + +#: public/views/copayers.html +msgid "Share invitation" +msgstr "Einladung teilen" + +#: public/views/copayers.html +msgid "Share this invitation with your copayers" +msgstr "Einladung mit Copayern teilen" + +#: public/views/walletHome.html +msgid "" +"Share this wallet address to receive payments. To protect your privacy, new " +"addresses are generated automatically once you use them." +msgstr "" +"Um Zahlungen zu empfangen, die hier angegebene Adresse teilen. Um die " +"Privatsphäre zu schützen wird nach jeder Nutzung eine neue Adresse erzeugt." + +#: public/views/create.html +msgid "Shared Wallet" +msgstr "Wallet teilen" + +#: public/views/create.html public/views/join.html +msgid "Show Advanced options" +msgstr "Erweiterte Optionen anzeigen" + +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Zahlung unterschreiben" + +#: src/js/controllers/walletHome.js +msgid "Signing transaction" +msgstr "Transaktion unterschreiben" + +#: src/js/controllers/index.js +msgid "Spanish" +msgstr "Español" + +#: src/js/controllers/copayers.js src/js/controllers/import.js +#: src/js/controllers/preferencesDelete.js +msgid "Success" +msgstr "Erfolgreich" + +#: public/views/walletHome.html +msgid "Tap to retry" +msgstr "Zum Wiederholen antippen" + +#: public/views/create.html +msgid "Testnet" +msgstr "Testnet" + +#: src/js/controllers/walletHome.js +msgid "" +"The payment was created but could not be completed. Please try again from " +"home screen" +msgstr "" +"Die Zahlung wurde erzeugt, kann aber nicht abgeschlossen werden. Bitte " +"erneut über die Startseite versuchen" + +#: src/js/controllers/walletHome.js +msgid "" +"The payment was created but could not be signed. Please try again from home " +"screen." +msgstr "" +"Die Zahlung wurde erzeugt, kann aber nicht unterschrieben werden. Bitte " +"erneut über die Startseite versuchen" + +#: public/views/modals/txp-details.html +msgid "The payment was removed by creator" +msgstr "Die Zahlung wurde vom Ersteller entfernt" + +#: src/js/controllers/walletHome.js +msgid "" +"The payment was signed but could not be broadcasted. Please try again from " +"home screen." +msgstr "" +"Die Zahlung wurde unterschrieben, kann aber nicht übertragen werden. Bitte " +"erneut über die Startseite versuchen" + +#: 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." +msgstr "" +"Der private Schlüssel für dieses Wallet ist verschlüsselt. Ein Export der " +"Sicherung behält diesen verschlüsselt im Sicherungsarchiv" + +#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +msgid "The wallet \"{{walletName}}\" was deleted" +msgstr "Wallet \"{{walletName}}\" wurde gelöscht" + +#: src/js/controllers/import.js +msgid "There is an error in the form" +msgstr "Es ist ein Fehler im Formular aufgetreten" + +#: public/views/walletHome.html +msgid "" +"This wallet is not registered at the given Bitcore Wallet Service (BWS). You " +"can recreate it from the local information." +msgstr "" +"Dieses Wallet ist nicht beim angegebenen Bitcore Wallet Service (BWS) " +"registriert. Bitte aus den lokalen Informationen wiederherstellen" + +#: public/views/modals/txp-details.html +msgid "Time" +msgstr "Zeit" + +#: public/views/walletHome.html public/views/includes/transaction.html +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "To" +msgstr "Zu" + +#: public/views/walletHome.html +msgid "Total Locked Balance" +msgstr "Ingesamt gesperrter Gesamtsaldo" + +#: public/views/modals/tx-details.html +msgid "Transaction" +msgstr "Transaktion" + +#: src/js/controllers/walletHome.js +msgid "Unable to send transaction proposal" +msgstr "Transaktionsvorschlag kann nicht gesendet werden" + +#: public/views/walletHome.html public/views/modals/tx-details.html +msgid "Unconfirmed" +msgstr "Unbestätigt" + +#: public/views/preferences.html +msgid "Unit" +msgstr "Währungseinheit" + +#: public/views/walletHome.html +msgid "Unsent transactions" +msgstr "Nicht vesendete Transaktionen" + +#: public/views/modals/paypro.html +msgid "Untrusted" +msgstr "Nicht Vertrauenswürdig" + +#: public/views/walletHome.html +msgid "Updating Wallet..." +msgstr "Wallet aktualisieren..." + +#: public/views/preferencesAbout.html +msgid "Version" +msgstr "Version" + +#: public/views/backup.html +msgid "View backup" +msgstr "Sicherung anzeigen" + +#: public/views/walletHome.html +msgid "WARNING: Backup needed" +msgstr "WARNUNG: Sicherung notwendig" + +#: public/views/walletHome.html +msgid "WARNING: Wallet not registered" +msgstr "WARNUNG: Wallet nicht registriert" + +#: public/views/splash.html +msgid "WELCOME TO COPAY" +msgstr "Willkommen bei COPAY" + +#: public/views/copayers.html +msgid "Waiting for copayers" +msgstr "Warte auf copayer" + +#: public/views/copayers.html +msgid "Waiting..." +msgstr "Warte..." + +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Alias" + +#: src/js/services/profileService.js +msgid "Wallet Already Imported:" +msgstr "Wallet bereits importiert:" + +#: public/views/join.html +msgid "Wallet Invitation" +msgstr "Wallet Einladung" + +#: public/views/join.html +msgid "Wallet Invitation is not valid!" +msgstr "Wallet Einladung nicht gültig!" + +#: src/js/services/profileService.js +msgid "Wallet already exists" +msgstr "Wallet exstiert bereits" + +#: public/views/copayers.html +msgid "Wallet incomplete and broken" +msgstr "Wallet unvollständig oder defekt" + +#: public/views/create.html +msgid "Wallet name" +msgstr "Name des Wallets" + +#: src/js/controllers/walletHome.js +msgid "" +"Wallet service timed out. Check your Internet connexion and your wallet " +"service configuration." +msgstr "" +"Walletdienst antwortet nicht. Bitte die Internetverbinung und Walletdienst " +"überprüfen." + +#: public/views/preferencesDeleteWallet.html +msgid "Warning!" +msgstr "Warnung!" + +#: src/js/services/profileService.js +msgid "Wrong password" +msgstr "Falsches Passwort" + +#: public/views/modals/confirmation.html +msgid "Yes" +msgstr "Ja" + +#: public/views/walletHome.html +msgid "You do not have a wallet" +msgstr "Kein Wallet vorhanden" + +#: public/views/backup.html public/views/import.html +msgid "Your backup password" +msgstr "Passwort zur Sicherung" + +#: public/views/create.html public/views/join.html +msgid "Your nickname" +msgstr "Name des Teilnehmers" + +#: public/views/includes/password.html +msgid "Your password" +msgstr "Passwort" + +#: public/views/importLegacy.html +msgid "Your profile password" +msgstr "Profilpasswort" + +#: src/js/controllers/import.js +msgid "Your wallet has been imported correctly" +msgstr "Das Wallet wurde korrekt importiert" + +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "E-Mail für Wallet Benachrichtigungen" + +#: public/views/walletHome.html +msgid "locked by pending payments" +msgstr "durch ausstehende Zahlungen gesperrt" + +#: public/views/copayers.html public/views/walletHome.html +#: public/views/includes/sidebar.html +msgid "of" +msgstr "von" + +#: public/views/walletHome.html +msgid "optional" +msgstr "zusätzlich" + +#: public/views/preferences.html +msgid "settings" +msgstr "Einstellungen" + +#: public/views/walletHome.html +msgid "too long!" +msgstr "zu lang!" + +#: src/js/controllers/importLegacy.js +msgid "" +"{{len}} wallets imported. Funds scanning in progress. Hold on to see updated " +"balance" +msgstr "" +"{{len}} Wallets importiert. Beträge werden gescannt. Bitte auf die " +"Aktualisierung des Gesamtsaldos warten" diff --git a/po/es.po b/po/es.po index 38867ddc4..6f2499a88 100644 --- a/po/es.po +++ b/po/es.po @@ -14,37 +14,40 @@ msgstr "" #: public/views/modals/txp-details.html msgid "" -"* Only transactions created by yourself with no peer signatures can be " -"removed" +"* A payment proposal can be deleted if 1) you are the creator, and no other " +"copayer has signed, or 2) 24 hours have passed since the proposal was " +"created." msgstr "" -"* Solo transacciones creadas por Usted mismo y sin firmar, pueden ser " -"eliminadas" +"* Una propuesta de pago puede ser eliminada si 1) Ud. es el creador, y " +"ningún otro copayer la ha firmado, o 2) han transcurrido 24 horas desde la " +"creación de la propuesta." #: public/views/backup.html msgid "" -"* You can safely install your backup on other device and use your wallet " -"from many devices at the same time." +"* You can safely install your backup on another device and use your wallet " +"from multiple devices at the same time." msgstr "" "* Usted puede instalar la copia de seguridad en otro dispositivo y usar el " "monedero al mismo tiempo en varios dispositivos." -#: public/views/splash/1.html +#: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "Monedero multifirma de bitcoin" -#: src/js/services/notificationsService.js -msgid "A transaction was finally rejected" -msgstr "Transacción finalmente rechazada" - #: public/views/preferences.html msgid "About Copay" msgstr "Acerca de Copay" +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "Aceptar" + #: public/views/includes/sidebar.html msgid "Add wallet" msgstr "Agregar monedero" -#: public/views/paymentUri.html public/views/modals/paypro.html +#: public/views/paymentUri.html public/views/modals/customized-amount.html +#: public/views/modals/paypro.html msgid "Address" msgstr "Dirección" @@ -52,16 +55,29 @@ msgstr "Dirección" msgid "Advanced" msgstr "Avanzado" +#: public/views/disclaimer.html +msgid "Agree" +msgstr "Aceptar" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "Alias de {{index.walletName}}" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "¿Ya dispone de un monedero?" + #: public/views/preferences.html msgid "Alternative Currency" msgstr "Moneda Alternativa" #: public/views/paymentUri.html public/views/walletHome.html +#: public/views/modals/customized-amount.html #: public/views/modals/txp-details.html msgid "Amount" msgstr "Importe" -#: public/views/walletHome.html +#: public/views/walletHome.html public/views/modals/customized-amount.html msgid "Amount in" msgstr "Importe en" @@ -77,6 +93,10 @@ msgstr "¿Estas seguro de borrar este monedero?" msgid "Available Balance" msgstr "Balance disponible" +#: public/views/create.html public/views/join.html +msgid "BIP32 master extended private key" +msgstr "BIP32 master extended private key" + #: public/views/includes/topbar.html public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Back" @@ -105,6 +125,10 @@ msgstr "" "Antes de recibir fondos, es altamente recomendable realizar una copia de " "seguridad." +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "Política de Costo de la Red Bitcoin" + #: public/views/paymentUri.html msgid "Bitcoin URI is NOT valid!" msgstr "¡Bitcoin URI no es válida!" @@ -113,13 +137,29 @@ msgstr "¡Bitcoin URI no es válida!" msgid "Bitcoin address" msgstr "Dirección bitcoin" +#: public/views/preferencesFee.html +msgid "" +"Bitcoin transactions may include a fee collected by miners on the network. " +"The higher the fee, the greater the incentive a miner has to include that " +"transaction in a block. The ‘Emergency’ level should only be used when there " +"is a network congestion." +msgstr "" +"Las transacciones de Bitcoin pueden incluir una tasa que es recaudada por " +"los mineros de la red. Cuanto mayor sea la tasa, mayor será el incentivo de " +"los mineros para incluir esa transacción en un bloque. El nivel 'Emergencia' " +"debe ser utilizado solo cuando hay una congestión en la red." + #: public/views/modals/txp-details.html -msgid "Broadcast Transaction" -msgstr "Emitir Transacción" +msgid "Broadcast Payment" +msgstr "Emitir Pago" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Emitiendo el Pago" #: src/js/controllers/walletHome.js msgid "Broadcasting transaction" -msgstr "Emitiendo la transacción" +msgstr "Emitiendo transacción" #: public/views/unsupported.html msgid "Browser unsupported" @@ -141,12 +181,26 @@ msgstr "Cancelar" msgid "Certified by" msgstr "Certificado por" +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "" +"Cambiar el alias del monedero solo afecta al nombre del monedero local." + +#: src/js/controllers/walletHome.js +msgid "Check you connection and try again" +msgstr "Verifique su conexión e inténtelo nuevamente" + #: public/views/import.html -msgid "Choose backup file from your computer" +msgid "Choose a backup file from your computer" msgstr "Seleccione el archivo backup de su computadora" +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "Seleccione un monedero para enviar fondos" + #: public/views/includes/topbar.html public/views/modals/copayers.html -#: public/views/modals/paypro.html public/views/modals/scanner.html +#: public/views/modals/customized-amount.html public/views/modals/paypro.html +#: public/views/modals/scanner.html public/views/modals/wallets.html msgid "Close" msgstr "Cerrar" @@ -167,21 +221,28 @@ msgid "Copayers" msgstr "Copayers" #: public/views/backup.html -msgid "Copy backup in a safe place" +msgid "Copy backup to a safe place" msgstr "Guardar copia de seguridad en un lugar seguro" #: public/views/backup.html -msgid "Copy this text as it is in a safe place (notepad or email)" +msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "" -"Copiar el texto como esta en un lugar seguro (notepad o correo electrónico)" +"Copiar el texto como esta en un lugar seguro (bloc de notas o correo " +"electrónico)" #: public/views/backup.html msgid "Copy to clipboard" msgstr "Copiar al portapapeles" #: src/js/controllers/walletHome.js -msgid "Could not broadcast transaction. Please try again." -msgstr "No se pudo emitir la transacción. Por favor, intente nuevamente." +msgid "Could not accept payment. Check you connection and try again" +msgstr "" +"No se pudo aceptar el pago. Verifique su conexión e inténtelo nuevamente" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment. Check you connection and try again" +msgstr "" +"No se pudo emitir el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js msgid "" @@ -191,6 +252,15 @@ msgstr "" "No se pudo conectar con Wallet Service. Verifique la conexión a internet y " "la configuración a Wallet Service." +#: src/js/controllers/walletHome.js +msgid "Could not create address. Check you connection and try again" +msgstr "" +"No se pudo crear la dirección. Verifique su conexión e inténtelo nuevamente" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "No se pudo crear la propuesta de pago" + #: src/js/services/profileService.js msgid "Could not create using the specified extended private key" msgstr "No se pudo crear el monedero usando la clave privada ingresada" @@ -200,8 +270,10 @@ msgid "Could not decrypt file, check your password" msgstr "No se pudo desencriptar el archivo, verifique su contraseña" #: src/js/controllers/walletHome.js -msgid "Could not delete transaction. Please try again." -msgstr "No se pudo borrar la transacción. Por favor, intente nuevamente." +msgid "Could not delete payment proposal. Check you connection and try again" +msgstr "" +"No se pudo eliminar la propuesta de pago. Verifique su conexión e inténtelo " +"nuevamente" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -224,29 +296,30 @@ msgid "Could not join wallet:" msgstr "No se pudo unir al monedero:" #: src/js/controllers/walletHome.js -msgid "Could not reject transaction. Please try again." -msgstr "No se pudo rechazar la transacción. Por favor, intente nuevamente." +msgid "Could not reject payment. Check you connection and try again" +msgstr "" +"No se pudo rechazar el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js -msgid "Could not send transaction. Please try again." -msgstr "No se pudo enviar la transacción. Por favor, intente nuevamente." - -#: src/js/controllers/walletHome.js -msgid "Could not sign transaction. Please try again." -msgstr "No se pudo firmar la transacción. Por favor, intente nuevamente." +msgid "Could not send payment" +msgstr "No se pudo enviar el pago" #: public/views/walletHome.html msgid "Could not update Wallet" msgstr "No se puede actualizar el monedero" -#: public/views/create.html public/views/walletHome.html +#: public/views/walletHome.html msgid "Create" msgstr "Crear" -#: public/views/add.html +#: public/views/add.html public/views/create.html msgid "Create new wallet" msgstr "Crear nuevo monedero" +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "Crea monedero {{requiredCopayers}}-de-{{totalCopayers}}" + #: public/views/includes/sidebar.html msgid "Create, join or import" msgstr "Crear, unirse o importar" @@ -255,7 +328,11 @@ msgstr "Crear, unirse o importar" msgid "Created by" msgstr "Creado por" -#: public/views/create.html public/views/splash/1.html +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Creando el Perfil..." + +#: public/views/create.html msgid "Creating Wallet..." msgstr "Creando Monedero..." @@ -267,6 +344,10 @@ msgstr "Creando transacción" msgid "Date" msgstr "Fecha" +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Eliminar Propuesta de Pago" + #: public/views/preferencesAdvanced.html msgid "Delete Wallet" msgstr "Eliminar monedero" @@ -280,8 +361,21 @@ msgid "Delete wallet" msgstr "Eliminar monedero" #: src/js/controllers/walletHome.js -msgid "Deleting transaction" -msgstr "Eliminando transacción" +msgid "Deleting payment" +msgstr "Eliminando el Pago" + +#: public/views/modals/customized-amount.html public/views/modals/paypro.html +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "Details" +msgstr "Detalles" + +#: src/js/controllers/index.js +msgid "Deutsch" +msgstr "Alemán" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Deshabilitado" #: public/views/backup.html msgid "Download backup" @@ -291,6 +385,18 @@ msgstr "Descargar copia de seguridad" msgid "ENTER" msgstr "ENTRAR" +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "Económico" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Notificaciones por Email" + +#: src/js/controllers/preferencesFee.js +msgid "Emergency" +msgstr "Emergencia" + #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Encriptar Clave Privada" @@ -331,6 +437,10 @@ msgstr "Falló al importar monederos" msgid "Family vacation funds" msgstr "Fondos para vacaciones en familia" +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Costo" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" @@ -344,21 +454,37 @@ msgstr "Francés" msgid "Funds received" msgstr "Fondos Recibidos" -#: public/views/splash/1.html +#: public/views/splash.html msgid "GET STARTED" msgstr "COMENZAR" +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "Generar código QR" + #: public/views/walletHome.html msgid "Generate new address" msgstr "Generar nueva dirección" +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "Obteniendo direcciones para el monedero {{selectedWalletName}} ..." + #: public/views/preferences.html msgid "Global settings" msgstr "Opciones globales" +#: public/views/disclaimer.html +msgid "Go back" +msgstr "Volver" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "¿Tiene una copia de seguridad de Copay v0.9?" + #: public/views/create.html public/views/join.html -msgid "Hide" -msgstr "Ocultar" +msgid "Hide Advanced options" +msgstr "Ocultar opciones avanzadas" #: src/js/controllers/index.js msgid "History" @@ -368,11 +494,11 @@ msgstr "Historial" msgid "Home" msgstr "Inicio" -#: public/views/create.html -msgid "If not given, a random key will be generated" -msgstr "Si no se ingresa, una clave aleatoria será generada" +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "Confirmo haber leído, entendido y aceptado estos términos." -#: public/views/join.html +#: public/views/create.html public/views/join.html msgid "If not given, a secure key will be generated" msgstr "Si no se ingresa, una clave segura será generada" @@ -380,18 +506,18 @@ msgstr "Si no se ingresa, una clave segura será generada" msgid "Import" msgstr "Importar" -#: public/views/import.html +#: public/views/import.html public/views/splash.html msgid "Import backup" msgstr "Importar copia de seguridad" -#: public/views/add.html -msgid "Import from Copay Beta 0.9" -msgstr "Importar de Copay Beta 0.9" - #: public/views/importLegacy.html msgid "Import from the Cloud?" msgstr "¿Importar de la Nube?" +#: public/views/import.html +msgid "Import here" +msgstr "Importar aquí" + #: public/views/add.html msgid "Import wallet" msgstr "Importar monedero" @@ -404,10 +530,6 @@ msgstr "Importando monedero..." msgid "Importing..." msgstr "Importando..." -#: public/views/modals/tx-details.html public/views/modals/txp-details.html -msgid "Information" -msgstr "Información" - #: src/js/controllers/index.js msgid "Japanese" msgstr "Japonés" @@ -440,7 +562,7 @@ msgstr "Más detalles para migrar Monedero" msgid "Make a payment to" msgstr "Hacer un pago a" -#: public/views/create.html +#: public/views/create.html public/views/join.html msgid "Master extended private key" msgstr "Master extended private key" @@ -449,7 +571,11 @@ msgstr "Master extended private key" msgid "Me" msgstr "Yo" -#: public/views/modals/paypro.html public/views/modals/tx-details.html +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "Nota" + +#: public/views/modals/tx-details.html msgid "Merchant message" msgstr "Mensaje del negocio" @@ -478,8 +604,8 @@ msgid "Network" msgstr "Red" #: src/js/services/notificationsService.js -msgid "New Transaction" -msgstr "Nueva Transacción" +msgid "New Payment Proposal" +msgstr "Nueva Propuesta de Pago" #: public/views/modals/confirmation.html msgid "No" @@ -489,7 +615,11 @@ msgstr "No" msgid "No transactions yet" msgstr "Sin transacciones todavía" -#: public/views/walletHome.html +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "Normal" + +#: public/views/walletHome.html public/views/modals/customized-amount.html msgid "Not valid" msgstr "No válido" @@ -502,6 +632,10 @@ msgstr "Nota" msgid "OKAY" msgstr "LISTO" +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "Participants" +msgstr "Participantes" + #: public/views/import.html public/views/importLegacy.html msgid "Password" msgstr "Contraseña" @@ -520,40 +654,88 @@ msgstr "Contraseña requerida" msgid "Passwords do not match" msgstr "Las contraseñas no coinciden" -#: public/views/import.html -msgid "Paste backup plain text code" -msgstr "Pegar copia de seguridad en texto plano" - #: public/views/join.html msgid "Paste invitation here" msgstr "Pegar invitación aquí" -#: src/js/controllers/walletHome.js -msgid "Payment Protocol not supported on Chrome App" -msgstr "El protocolo de pagos no está soportado en Chrome" +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Pegar copia de seguridad en texto plano" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Pagar A" #: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "El Pago fue Aceptado" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Propuesta de Pago" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Propuesta de Pago Creada" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Propuesta de Pago Rechazada" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Propuesta de Pago Rechazada por Copayer" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Propuesta de Pago Firmada por Copayer" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Propuestas de Pago" + +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "El protocolo de pago no está soportado en Chrome" + +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "El pago fue rechazado" + +#: public/views/modals/tx-status.html src/js/services/notificationsService.js msgid "Payment Sent" msgstr "Pago Enviado" +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "El pago aceptado..." + #: public/views/modals/txp-details.html msgid "Payment details" msgstr "Detalles del pago" +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "El pago fue finalmente rechazado" + #: public/views/modals/paypro.html -msgid "Payment protocol request" +msgid "Payment request" msgstr "Solicitud de pago" +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "¡Pago enviado!" + #: public/views/walletHome.html msgid "Payment to" msgstr "Pago a" #: public/views/preferencesDeleteWallet.html -msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED" +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "" "Borrar permanentemente este monedero. ESTA ACCIÓN NO PUEDE SER REVERTIDA" -#: public/views/walletHome.html +#: public/views/create.html msgid "Personal Wallet" msgstr "Monedero Personal" @@ -565,10 +747,26 @@ msgstr "Por favor ingrese los campos requeridos" msgid "Please, select your backup file" msgstr "Por favor, selecciona el archivo de copia de seguridad" +#: src/js/controllers/index.js +msgid "Portuguese" +msgstr "Portugués" + #: public/views/walletHome.html msgid "Preferences" msgstr "Preferencias" +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "Prioritario" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "Código QR" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "Escáner QR" + #: src/js/controllers/index.js msgid "Receive" msgstr "Recibir" @@ -594,26 +792,26 @@ msgid "Reject" msgstr "Rechazar" #: src/js/controllers/walletHome.js -msgid "Rejecting transaction" -msgstr "Rechazando transacción" +msgid "Rejecting payment" +msgstr "Rechazando pago" #: public/views/preferencesAbout.html msgid "Release Information" msgstr "Información de la versión" -#: public/views/modals/txp-details.html -msgid "Remove transaction" -msgstr "Elimine la transacción" - #: public/views/backup.html public/views/includes/password.html msgid "Repeat password" msgstr "Repite la contraseña" +#: public/views/walletHome.html public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "Solicitar una cantidad específica" + #: public/views/import.html public/views/join.html msgid "Required" msgstr "Requerido" -#: public/views/splash/1.html +#: public/views/splash.html msgid "Retrying..." msgstr "Reintentando..." @@ -625,10 +823,15 @@ msgstr "ESTABLECER" msgid "SKIP BACKUP" msgstr "OMITIR" -#: public/views/preferencesBwsUrl.html +#: public/views/preferencesAlias.html public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html msgid "Save" msgstr "Guardar" +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Guardando preferencias..." + #: src/js/services/notificationsService.js msgid "Scan Finished" msgstr "Escáner Finalizado" @@ -658,8 +861,8 @@ msgid "Select a wallet" msgstr "Seleccione un monedero" #: public/views/create.html -msgid "Select required signatures" -msgstr "Seleccione las firmas requeridas" +msgid "Select required number of signatures" +msgstr "Seleccione el número de firmas requeridas" #: public/views/create.html msgid "Select total number of copayers" @@ -670,6 +873,10 @@ msgstr "Seleccione el total de copayers" msgid "Send" msgstr "Enviar" +#: public/views/walletHome.html +msgid "Send All" +msgstr "Enviar Todo" + #: public/views/backup.html public/views/preferencesLogs.html msgid "Send by email" msgstr "Enviar por correo electrónico" @@ -694,6 +901,17 @@ msgstr "Establecer contraseña para tu copia de seguridad" msgid "Set up a password" msgstr "Configure una contraseña" +#: public/views/preferencesEmail.html +msgid "" +"Setting up email notifications could weaken your privacy, if the wallet " +"service provider is compromised. Information available to an attacker would " +"include your wallet addresses and its balance, but no more." +msgstr "" +"Configurar notificaciones por correo electrónico podría debilitar su " +"privacidad, si el proveedor de servicio se ve comprometido. Información " +"disponible para un atacante incluiría sus direcciones de cartera y su " +"balance, pero no más." + #: public/views/walletHome.html msgid "Share address" msgstr "Compartir dirección" @@ -708,23 +926,23 @@ msgstr "Comparta esta invitación con sus copayers" #: 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." +"Share this wallet address to receive payments. To protect your privacy, new " +"addresses are generated automatically once you use them." msgstr "" -"Compartir esto para que le envíen los pagos. Para proteger tu privacidad, " -"nuevas direcciones se generan automáticamente una vez que los usas." +"Compartir esta dirección para recibir pagos. Para proteger su privacidad, se " +"generan nuevas direcciones automáticamente luego de recibir un pago." + +#: public/views/create.html +msgid "Shared Wallet" +msgstr "Monedero Compartido" #: public/views/create.html public/views/join.html -msgid "Show" -msgstr "Mostrar" +msgid "Show Advanced options" +msgstr "Mostrar opciones avanzadas" -#: public/views/modals/txp-details.html -msgid "Sign" -msgstr "Firmar" - -#: public/views/modals/tx-details.html public/views/modals/txp-details.html -msgid "Signatures" -msgstr "Firmas" +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Firmando el pago" #: src/js/controllers/walletHome.js msgid "Signing transaction" @@ -734,10 +952,6 @@ msgstr "Firmando transacción" msgid "Spanish" msgstr "Español" -#: public/views/walletHome.html -msgid "Spend proposals" -msgstr "Propuestas de gastos" - #: src/js/controllers/copayers.js src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js msgid "Success" @@ -747,25 +961,148 @@ msgstr "Listo" msgid "Tap to retry" msgstr "Toque para reintentar" +#: public/views/disclaimer.html public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "Términos de Uso" + +#: public/views/create.html +msgid "Testnet" +msgstr "Testnet" + +#: 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 -msgid "The transaction was removed by creator" -msgstr "La transacción fue eliminada por el creado" +msgid "The payment was removed by creator" +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 +msgid "" +"The private key for this wallet is encrypted. Exporting a backup will keep " +"the private key encrypted in the backup archive." +msgstr "" +"Este monedero tiene sus claves privadas encriptadas. Exportar una copia de " +"seguridad mantendrá la clave privada encriptada en la copia de seguridad." + +#: public/views/disclaimer.html +msgid "" +"The software you are about to use functions as a free, open source, and " +"multi-signature digital wallet. The software does not constitute an account " +"where BitPay or other third parties serve as financial intermediaries or " +"custodians of your bitcoin. While the software has undergone beta testing " +"and continues to be improved by feedback from the open-source user and " +"developer community, we cannot guarantee that there will be no bugs in the " +"software. You acknowledge that your use of this software is at your own " +"discretion and in compliance with all applicable laws. You are responsible " +"for safekeeping your passwords, private key pairs, PINs and any other codes " +"you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR " +"YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF " +"YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY " +"BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME " +"INACCESSIBLE. All transaction requests are irreversible. The authors of the " +"software, employees and affiliates of Bitpay, copyright holders, and BitPay, " +"Inc. cannot retrieve your private keys or passwords if you lose or forget " +"them and cannot guarantee transaction confirmation as they do not have " +"control over the Bitcoin network. To the fullest extent permitted by law, " +"this software is provided “as is” and no representations or warranties can " +"be made of any kind, express or implied, including but not limited to the " +"warranties of merchantability, fitness or a particular purpose and " +"noninfringement. You assume any and all risks associated with the use of the " +"software. In no event shall the authors of the software, employees and " +"affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for " +"any claim, damages or other liability, whether in an action of contract, " +"tort, or otherwise, arising from, out of or in connection with the software. " +"We reserve the right to modify this disclaimer from time to time." +msgstr "" +"El software que va a utilizar es un monedero digital de código abierto y " +"multi-firmas. El software no constituye una cuenta donde BitPay u otras " +"terceras partes sirven como intermediarios financieros o custodios de su " +"bitcoin. Mientras que el software ha sido objeto de pruebas beta y continúa " +"siendo mejorada por los comentarios de los usuarios de código abierto y la " +"comunidad de desarrolladores, no podemos garantizar que no habrá errores en " +"el software. Usted reconoce que el uso de este software es bajo tu propia " +"responsabilidad y en cumplimiento con todas las leyes aplicables. Usted es " +"responsable de la custodia de sus contraseñas, pares de claves privadas, PIN " +"y cualquier otro código que se utiliza para acceder al software. SI UD. " +"PIERDE ACCESO A SU MONEDERO COPAY O A SUS CLAVES PRIVADAS ENCRIPTADAS Y NO " +"HA GUARDADO POR SEPARADO UNA COPIA DE SEGURIDAD DE SU MONEDERO Y CONTRASEÑA " +"CORRESPONDIENTES, USTED RECONOCE Y ACEPTA QUE CUALQUIER BITCOIN QUE HA " +"ASOCIADO CON ESE MONEDERO COPAY SERÁ INACCESIBLE. Todas las solicitudes de " +"transacción son irreversibles. Los autores de los software, empleados y " +"afiliados de Bitpay, los titulares de derechos de autor, y BitPay, Inc. no " +"pueden recuperar sus claves privadas o contraseñas si se pierde o se olvida " +"de ellos y no se puede garantizar la confirmación de la transacción, ya que " +"no tienen control sobre la red Bitcoin. En la máxima medida permitida por la " +"ley, este software se proporciona \"tal cual\" y no asume la responsabilidad " +"ni ofrece garantías de ningún tipo, expresa o implícita, incluyendo, pero no " +"limitado a las garantías comerciales, de conveniencia o a un propósito " +"particular. Usted asume todos los riesgos asociados con el uso del software. " +"En ningún caso los autores, empleados y afiliados de Bitpay, los titulares " +"de derechos de autor, o BitPay, Inc. serán declarados responsables de los " +"reclamos, daños o cualquier otra responsabilidad, ya sea en una acción de " +"contrato, agravio o de otra manera, que surja fuera de la conexión con el " +"software. Nos reservamos el derecho a modificar el presente aviso legal de " +"vez en cuando.

The software you are about to use functions as a free, " +"open source, and multi-signature digital wallet. The software does not " +"constitute an account where BitPay or other third parties serve as financial " +"intermediaries or custodians of your bitcoin. While the software has " +"undergone beta testing and continues to be improved by feedback from the " +"open-source user and developer community, we cannot guarantee that there " +"will be no bugs in the software. You acknowledge that your use of this " +"software is at your own discretion and in compliance with all applicable " +"laws. You are responsible for safekeeping your passwords, private key pairs, " +"PINs and any other codes you use to access the software. IF YOU LOSE ACCESS " +"TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT " +"SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU " +"ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY " +"WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. " +"The authors of the software, employees and affiliates of Bitpay, copyright " +"holders, and BitPay, Inc. cannot retrieve your private keys or passwords if " +"you lose or forget them and cannot guarantee transaction confirmation as " +"they do not have control over the Bitcoin network. To the fullest extent " +"permitted by law, this software is provided “as is” and no representations " +"or warranties can be made of any kind, express or implied, including but not " +"limited to the warranties of merchantability, fitness or a particular " +"purpose and noninfringement. You assume any and all risks associated with " +"the use of the software. In no event shall the authors of the software, " +"employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be " +"held liable for any claim, damages or other liability, whether in an action " +"of contract, tort, or otherwise, arising from, out of or in connection with " +"the software. We reserve the right to modify this disclaimer from time to " +"time." #: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" msgstr "El monedero \"{{walletName}}\" fue eliminado" +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "No dispone de monederos para realizar este pago" + #: src/js/controllers/import.js msgid "There is an error in the form" -msgstr "Hubo un error en el formulario" - -#: public/views/backup.html -msgid "" -"This wallet have its private key encrypted. Exporting a backup will keep the " -"private key encrypted on the backup." -msgstr "" -"Este monedero tiene sus claves privadas encriptadas. Exportar una copia de " -"seguridad mantendrá la clave privada encriptada en la misma." +msgstr "Hay un error en el formulario" #: public/views/walletHome.html msgid "" @@ -780,8 +1117,7 @@ msgid "Time" msgstr "Hora" #: 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 +#: public/views/modals/tx-details.html public/views/modals/txp-details.html msgid "To" msgstr "Para" @@ -793,54 +1129,6 @@ msgstr "Balance total bloqueado" msgid "Transaction" msgstr "Transacción" -#: src/js/services/notificationsService.js -msgid "Transaction Rejected" -msgstr "Transacción Rechazada" - -#: src/js/services/notificationsService.js -msgid "Transaction Sent" -msgstr "Transacción Enviada" - -#: src/js/services/notificationsService.js -msgid "Transaction Signed" -msgstr "Transacción Firmada" - -#: public/views/modals/txp-details.html -msgid "Transaction accepted..." -msgstr "Transacción aceptada..." - -#: src/js/services/txStatus.js -msgid "Transaction broadcasted" -msgstr "Transacción enviada" - -#: public/views/modals/txp-details.html -msgid "Transaction finally rejected" -msgstr "Transacción finalmente rechazada" - -#: src/js/controllers/walletHome.js -msgid "Transaction not broadcasted. Please try again." -msgstr "Transacción no emitida. Por favor, intente nuevamente." - -#: public/views/modals/txp-details.html -msgid "Transaction proposal" -msgstr "Propuestas de transacción" - -#: src/js/services/txStatus.js -msgid "Transaction proposal created" -msgstr "Propuesta de transacción creada" - -#: src/js/services/txStatus.js -msgid "Transaction proposal signed" -msgstr "Propuesta de transacción firmada" - -#: public/views/modals/txp-details.html -msgid "Transaction sent!" -msgstr "¡Transacción enviada!" - -#: src/js/services/txStatus.js -msgid "Transaction was rejected" -msgstr "Transacción rechazada" - #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "No se puede enviar propuesta de transacción" @@ -865,10 +1153,6 @@ msgstr "No es de confianza" msgid "Updating Wallet..." msgstr "Actualizando Monedero..." -#: public/views/create.html -msgid "Use test network" -msgstr "Red de prueba" - #: public/views/preferencesAbout.html msgid "Version" msgstr "Versión" @@ -885,7 +1169,7 @@ msgstr "ADVERTENCIA: Se requiere hacer copia de seguridad" msgid "WARNING: Wallet not registered" msgstr "ADVERTENCIA: Monedero no registrado" -#: public/views/splash/1.html +#: public/views/splash.html msgid "WELCOME TO COPAY" msgstr "BIENVENIDO A COPAY" @@ -897,6 +1181,10 @@ msgstr "Esperando copayers" msgid "Waiting..." msgstr "Esperando..." +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Alias del monedero" + #: src/js/services/profileService.js msgid "Wallet Already Imported:" msgstr "Este monedero ya fue importado: " @@ -942,7 +1230,7 @@ msgid "Yes" msgstr "Si" #: public/views/walletHome.html -msgid "You do not have any wallet" +msgid "You do not have a wallet" msgstr "No tienes ningún monedero" #: public/views/backup.html public/views/import.html @@ -965,16 +1253,16 @@ msgstr "Contraseña de tu perfil" msgid "Your wallet has been imported correctly" msgstr "Su monedero se ha importado correctamente" -#: public/views/create.html public/views/join.html -msgid "advanced options" -msgstr "opciones avanzadas" +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "email para recibir notificaciones" #: public/views/walletHome.html -msgid "in pending transactions" -msgstr "en transacciones pendientes" +msgid "locked by pending payments" +msgstr "bloqueado por pagos pendientes" -#: public/views/copayers.html public/views/create.html -#: public/views/walletHome.html public/views/includes/sidebar.html +#: public/views/copayers.html public/views/walletHome.html +#: public/views/includes/sidebar.html msgid "of" msgstr "de" @@ -982,17 +1270,21 @@ msgstr "de" msgid "optional" msgstr "opcional" +#: public/views/preferences.html +msgid "settings" +msgstr "configuración" + #: public/views/walletHome.html msgid "too long!" msgstr "¡demasiado largo!" -#: public/views/create.html -msgid "wallet" -msgstr "monedero" +#: public/views/preferencesFee.html +msgid "{{fee.value}} bits per kB" +msgstr "{{fee.value}} bits por kB" -#: public/views/preferences.html -msgid "{{index.walletName}} settings" -msgstr "Opciones de {{index.walletName}}" +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}} se descontarán de los costos de la red bitcoin" #: src/js/controllers/importLegacy.js msgid "" @@ -1002,8 +1294,90 @@ msgstr "" "{{len}} monederos importados. Escáner de fondos en progreso. Espere a ver el " "balance actualizado" -#~ msgid "Transaction could not be deleted. Please try again." -#~ msgstr "La transacción no se pudo eliminar. Por favor, intente nuevamente." +#~ msgid "Receive a customized amount" +#~ msgstr "Recibir un monto personalizado" + +#~ msgid "" +#~ "* Only payment proposals created by yourself with no peer actions can be " +#~ "removed" +#~ msgstr "" +#~ "* Solo transacciones creadas por Usted mismo sin haber realizado acciones " +#~ "por otros usuarios, pueden ser eliminadas" + +#~ msgid "Alias for" +#~ msgstr "Alias para" + +#~ msgid "Hide" +#~ msgstr "Ocultar" + +#~ msgid "If not given, a random key will be generated" +#~ msgstr "Si no se ingresa, una clave aleatoria será generada" + +#~ msgid "Show" +#~ msgstr "Mostrar" + +#~ msgid "wallet" +#~ msgstr "monedero" + +#~ msgid "Transaction not broadcasted. Please try again." +#~ msgstr "Transacción no emitida. Por favor, intente nuevamente." + +#~ msgid "Could not sign transaction. Please try again." +#~ msgstr "No se pudo firmar la transacción. Por favor, intente nuevamente." + +#~ msgid "Payment Proposal Sent" +#~ msgstr "Propuesta de Pago Enviada" + +#~ msgid "Use test network" +#~ msgstr "Red de prueba" + +#~ msgid "A transaction was finally rejected" +#~ msgstr "Transacción finalmente rechazada" + +#~ msgid "Import from Copay Beta 0.9" +#~ msgstr "Importar de Copay Beta 0.9" + +#~ msgid "Information" +#~ msgstr "Información" + +#~ msgid "New Transaction" +#~ msgstr "Nueva Transacción" + +#~ msgid "Remove transaction" +#~ msgstr "Elimine la transacción" + +#~ msgid "Sign" +#~ msgstr "Firmar" + +#~ msgid "Signatures" +#~ msgstr "Firmas" + +#~ msgid "Spend proposals" +#~ msgstr "Propuestas de gastos" + +#~ msgid "Transaction Rejected" +#~ msgstr "Transacción Rechazada" + +#~ msgid "Transaction Sent" +#~ msgstr "Transacción Enviada" + +#~ msgid "Transaction Signed" +#~ msgstr "Transacción Firmada" + +#~ msgid "Transaction broadcasted" +#~ msgstr "Transacción enviada" + +#~ msgid "Transaction proposal" +#~ msgstr "Propuestas de transacción" + +#~ msgid "Transaction proposal signed" +#~ msgstr "Propuesta de transacción firmada" + +#~ msgid "Transaction sent!" +#~ msgstr "¡Transacción enviada!" + +#~ msgid "Transaction was rejected" +#~ msgstr "Transacción rechazada" #~ msgid "Transaction not rejected. Please try again." #~ msgstr "Transacción no rechazada. Por favor, intente nuevamente." @@ -1036,9 +1410,6 @@ msgstr "" #~ "Borrar permanentemente este monedero. ADVERTENCIA: esta acción no puede " #~ "deshacerse." -#~ msgid "Could not create wallet:" -#~ msgstr "No se puede crear el monedero" - #~ msgid "OK" #~ msgstr "LISTO" @@ -1102,12 +1473,6 @@ msgstr "" #~ msgid "Note:" #~ msgstr "Nota:" -#~ msgid "QR-Scanner" -#~ msgstr "Escáner QR" - -#~ msgid "Select a wallet to make the payment" -#~ msgstr "Seleccione monedero para realizar el pago" - #~ msgid "Skip" #~ msgstr "Omitir" @@ -1117,9 +1482,6 @@ msgstr "" #~ msgid "change" #~ msgstr "vuelto" -#~ msgid "BIP32 master extended private key" -#~ msgstr "BIP32 master extended private key" - #~ msgid "Bitcore Wallet Service URL" #~ msgstr "Bitcore Wallet Service URL" @@ -1192,9 +1554,6 @@ msgstr "" #~ msgid "Copay now needs a profile to access wallets." #~ msgstr "Copay ahora requiere un perfil para acceder a los monederos" -#~ msgid "Create Profile" -#~ msgstr "Crear Perfil" - #~ msgid "Create in the cloud" #~ msgstr "Crear en la nube" @@ -1240,18 +1599,9 @@ msgstr "" #~ msgid "Form Error" #~ msgstr "Error en formulario" -#~ msgid "Get QR code" -#~ msgstr "Obtener código QR" - #~ msgid "Hide them" #~ msgstr "Ocultar" -#~ msgid "I read and agree with these terms" -#~ msgstr "He leído y aceptado estos términos" - -#~ msgid "Import Profile" -#~ msgstr "Importar Perfil" - #~ msgid "Import a backup" #~ msgstr "Importar una copia de seguridad" @@ -1451,9 +1801,6 @@ msgstr "" #~ msgid "Session will be closed" #~ msgstr "La sesión se cerrará" -#~ msgid "Settings" -#~ msgstr "Configuración" - #~ msgid "Share secret" #~ msgstr "Compartir código secreto" @@ -1463,9 +1810,6 @@ msgstr "" #~ msgid "Sign in" #~ msgstr "Ingresar" -#~ msgid "Signing out" -#~ msgstr "Saliendo" - #~ msgid "Skip public keys" #~ msgstr "Ignorar claves pública" @@ -1481,89 +1825,12 @@ msgstr "" #~ msgid "Storage" #~ msgstr "Almacenamiento" -#~ msgid "Testnet" -#~ msgstr "Testnet" - #~ msgid "The balance is updated using the derived addresses" #~ msgstr "El balance es actualizado utilizando direcciones derivadas" #~ msgid "The secret string you entered is invalid" #~ msgstr "La palabra secreta ingresada no es válida" -#~ msgid "" -#~ "The software you are about to use is free, open source, and unsupported " -#~ "beta software. It is important to understand\n" -#~ " that beta software refers to software that is undergoing testing " -#~ "and has not officially been released, could have\n" -#~ " bugs, and may not act in a reliable fashion. Because the software " -#~ "is currently in beta, it is possible but not certain\n" -#~ " that you may lose bitcoin or the value of your bitcoin. It is " -#~ "recommended that you store only nominal amounts of\n" -#~ " bitcoins. You acknowledge that your use of this software is at your " -#~ "own discretion and in compliance with all\n" -#~ " applicable laws. You are responsible for safekeeping your login " -#~ "IDs, passwords, private key pairs, PINs and any other\n" -#~ " codes you use to access the software. IF YOU HAVE NOT SEPARATELY " -#~ "STORED A BACKUP OF ANY WALLET ADDRESSES AND PRIVATE\n" -#~ " KEY PAIRS MAINTAINED IN YOUR ACCOUNT, YOU ACKNOWLEDGE AND AGREE " -#~ "THAT ANY BITCOINS YOU HAVE ASSOCIATED WITH SUCH WALLET\n" -#~ " ADDRESSES WILL BECOME INACCESSIBLE IF YOU DO NOT HAVE YOUR ACCOUNT " -#~ "PASSWORD AND/OR PIN. All transaction requests are\n" -#~ " irreversible. The authors of the software, employees and " -#~ "affiliates of Bitpay, copyright holders, and BitPay, Inc.\n" -#~ " cannot retrieve your private keys or passwords if you lose or " -#~ "forget them and cannot guarantee transaction\n" -#~ " confirmation as they do not have control over the Bitcoin network. " -#~ "You agree to provide accurate and complete\n" -#~ " information in connection with your use of the account. You assume " -#~ "any and all risk associated with the use of the\n" -#~ " software. To the fullest extent permitted by law, this software is " -#~ "provided “as is” and no representations or\n" -#~ " warranties can be made of any kind, express or implied, including " -#~ "but not limited to the warranties of\n" -#~ " merchantability, fitness or a particular purpose and " -#~ "noninfringement. In no event shall the authors of the software,\n" -#~ " employees and affiliates of Bitpay, copyright holders, or BitPay, " -#~ "Inc. be held liable for any claim, damages or other\n" -#~ " liability, whether in an action of contract, tort, or otherwise, " -#~ "arising from, out of or in connection with the\n" -#~ " software or the use or other dealings in the software. We reserve " -#~ "the right to modify this disclaimer from time to\n" -#~ " time." -#~ msgstr "" -#~ "El software que van a utilizar es libre de código abierto y software beta " -#~ "no admitido. Es importante entender que el software beta se refiere al " -#~ "software que es someterse a la prueba no ha sido lanzado oficialmente, " -#~ "puede tener errores y no puede actuar de una manera confiable. Porque el " -#~ "software está actualmente en fase beta, es posible pero no seguro de que " -#~ "puede perder bitcoin o el valor de tu bitcoin. Se recomienda que guarde " -#~ "sólo nominales cantidades de bitcoins. Usted reconoce que el uso de este " -#~ "software es bajo su propia discreción y cumple con todas las leyes " -#~ "aplicables. Usted es responsable de la custodia su ID de inicio de " -#~ "sesión, contraseñas, pares de claves privadas, pernos y cualquier otros " -#~ "códigos que utilizas para acceder al software. SI NO HAS ALMACENADO POR " -#~ "SEPARADO UNA COPIA DE SEGURIDAD DE CUALQUIER CARTERA DIRECCIONES Y PARES " -#~ "DE CLAVES PRIVADAS MANTENIDAS EN SU CUENTA, USTED RECONOCE Y ACEPTA QUE " -#~ "CUALQUIER BITCOINS SE HA ASOCIADO CON TALES DIRECCIONES CARTERA SERÁ " -#~ "INACCESIBLES SI NO TIENES TU CONTRASEÑA O PIN. Todas las solicitudes de " -#~ "transacción son irreversibles. Los autores del software, empleados y " -#~ "afiliados de Bitpay, los titulares del copyright y BitPay, Inc. no pueden " -#~ "recuperar sus claves o contraseñas si pierde u olvida y no garantiza la " -#~ "confirmación de la transacción como no tienen control sobre la red " -#~ "Bitcoin. Usted acepta proporcionar información precisa y completa en " -#~ "relación con su uso de la cuenta. Usted asume todo riesgo asociado con el " -#~ "uso del software. En la medida permitida por la ley, este software se " -#~ "proporciona \"tal cual\" y sin representaciones o garantías pueden ser " -#~ "hechas de cualquier tipo, expresas o implícitas, incluyendo pero no " -#~ "limitadas a, las garantías de comerciabilidad, idoneidad o un propósito " -#~ "particular y no infracción. En ningún caso los autores del software, " -#~ "empleados y afiliados de Bitpay, los titulares del copyright o BitPay, " -#~ "Inc. responderá de cualquier reclamación, daños u otra responsabilidad, " -#~ "ya sea en una acción de contrato, agravio o de lo contrario, que se " -#~ "presentaba de, fuera de o en relación con el software o el uso u otras " -#~ "reparticiones en el software. Nos reservamos el derecho de modificar este " -#~ "aviso de vez en cuando." - #~ msgid "The transaction proposal has been created" #~ msgstr "La propuesta de transacción fue creada" @@ -1701,9 +1968,6 @@ msgstr "" #~ msgid "seconds" #~ msgstr "segundos" -#~ msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" -#~ msgstr "Crea monedero {{requiredCopayers}}-de-{{totalCopayers}}" - #, fuzzy #~ msgid "" #~ "Network Error.
Attempting to " @@ -1722,17 +1986,11 @@ msgstr "" #~ msgid "Connecting..." #~ msgstr "Conectando..." -#~ msgid "Create a new wallet" -#~ msgstr "Crear un nuevo monedero" - #~ msgid "Creating and storing a backup will allow you to recover wallet funds" #~ msgstr "" #~ "Crear y guardar una copia de seguridad le permitirá recuperar el dinero " #~ "de su monedero" -#~ msgid "Fee" -#~ msgstr "Tasa" - #~ msgid "" #~ "If all funds have been removed from your wallet and you do not wish to " #~ "have the wallet data stored on your computer anymore, you can delete your " @@ -1774,9 +2032,6 @@ msgstr "" #~ msgid "Ready" #~ msgstr "Listo" -#~ msgid "Send to" -#~ msgstr "Enviar a" - #~ msgid "Show all" #~ msgstr "Ver todo" @@ -1855,9 +2110,6 @@ msgstr "" #~ msgid "Your Password" #~ msgstr "Tu contraseña" -#~ msgid "Bitcoin Network" -#~ msgstr "Red Bitcoin" - #~ msgid "Download seed backup" #~ msgstr "Descargar copia de seguridad" diff --git a/po/fr.po b/po/fr.po index 0f624bce4..94a104e5d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,30 +13,31 @@ msgstr "" "X-Generator: Poedit 1.6.10\n" #: public/views/modals/txp-details.html -msgid "* Only transactions created by yourself with no peer signatures can be removed" -msgstr "Seules les transactions créées par vous-même sans signatures de pairs peuvent être supprimées" +msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." +msgstr " Une proposition de transaction peut être supprimée si 1) vous êtes le créateur, et aucun des autres copayers n'a signé, ou 2) 24 heures sont passées depuis la création de la proposition." #: public/views/backup.html -msgid "* You can safely install your backup on other device and use your wallet from many devices at the same time." +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." msgstr "Vous pouvez installer en toute sécurité votre sauvegarde sur un autre appareil et utiliser votre portefeuille depuis plusieurs appareils en même temps." -#: public/views/splash/1.html +#: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "Un portefeuille bitcoin multi-signatures" -#: src/js/services/notificationsService.js -msgid "A transaction was finally rejected" -msgstr "Une transaction a été finalement rejetée" - #: public/views/preferences.html msgid "About Copay" msgstr "À propos de Copay" +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "Accepter" + #: public/views/includes/sidebar.html msgid "Add wallet" msgstr "Ajouter un portefeuille" #: public/views/paymentUri.html +#: public/views/modals/customized-amount.html #: public/views/modals/paypro.html msgid "Address" msgstr "Adresse" @@ -45,17 +46,31 @@ msgstr "Adresse" msgid "Advanced" msgstr "Avancés" +#: public/views/disclaimer.html +msgid "Agree" +msgstr "Accepter" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "Alias pour {{index.walletName}}" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "Vous avez déjà un portefeuille ?" + #: public/views/preferences.html msgid "Alternative Currency" msgstr "Devise alternative" #: public/views/paymentUri.html #: public/views/walletHome.html +#: public/views/modals/customized-amount.html #: public/views/modals/txp-details.html msgid "Amount" msgstr "Montant" #: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Amount in" msgstr "Montant en" @@ -72,6 +87,11 @@ msgstr "Êtes-vous certain de vouloir supprimer ce portefeuille ?" msgid "Available Balance" msgstr "Solde disponible" +#: public/views/create.html +#: public/views/join.html +msgid "BIP32 master extended private key" +msgstr "Clé privée étendue maîtresse BIP32" + #: public/views/includes/topbar.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html @@ -98,6 +118,10 @@ msgstr "Options de sauvegarde" msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "Avant de recevoir des fonds, il est fortement recommandé de sauvegarder les clés de votre portefeuille." +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "Politique des frais de réseau Bitcoin" + #: public/views/paymentUri.html msgid "Bitcoin URI is NOT valid!" msgstr "L'URI Bitcoin n'est pas valide !" @@ -106,9 +130,17 @@ msgstr "L'URI Bitcoin n'est pas valide !" msgid "Bitcoin address" msgstr "Adresse Bitcoin" +#: public/views/preferencesFee.html +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgstr "Les transactions Bitcoin peuvent inclure des frais collectés par les mineurs du réseau. Plus les frais sont élevés, et plus l'incitation à inclure une transaction dans un bloc est importante pour les mineurs. La priorité "Urgente" ne devrait être utilisée que lorsque le réseau présente une congestion." + #: public/views/modals/txp-details.html -msgid "Broadcast Transaction" -msgstr "Diffuser transaction" +msgid "Broadcast Payment" +msgstr "Diffuser le paiement" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Diffusion du paiement" #: src/js/controllers/walletHome.js msgid "Broadcasting transaction" @@ -135,14 +167,28 @@ msgstr "Annuler" msgid "Certified by" msgstr "Certifié par" +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "La modification d'un alias de portefeuille affecte uniquement le nom du portefeuille local." + +#: src/js/controllers/walletHome.js +msgid "Check you connection and try again" +msgstr "Vérifiez votre connexion internet et réessayez" + #: public/views/import.html -msgid "Choose backup file from your computer" +msgid "Choose a backup file from your computer" msgstr "Choisissez un fichier de sauvegarde depuis votre ordinateur" +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "Choisissez un portefeuille pour envoyer des fonds" + #: public/views/includes/topbar.html #: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html #: public/views/modals/paypro.html #: public/views/modals/scanner.html +#: public/views/modals/wallets.html msgid "Close" msgstr "Fermer" @@ -163,25 +209,37 @@ msgid "Copayers" msgstr "Copayers" #: public/views/backup.html -msgid "Copy backup in a safe place" -msgstr "Copiez la sauvegarde dans un endroit sûr" +msgid "Copy backup to a safe place" +msgstr "Copiez la sauvegarde vers un endroit sûr" #: public/views/backup.html -msgid "Copy this text as it is in a safe place (notepad or email)" -msgstr "Copiez le texte dans un endroit sûr (bloc-notes ou e-mail)" +msgid "Copy this text as it is to a safe place (notepad or email)" +msgstr "Copiez ce texte présenté tel quel vers un endroit sûr (bloc-notes ou e-mail)" #: public/views/backup.html msgid "Copy to clipboard" msgstr "Copier dans le presse-papier" #: src/js/controllers/walletHome.js -msgid "Could not broadcast transaction. Please try again." -msgstr "Impossible de diffuser la transaction. Veuillez réessayer." +msgid "Could not accept payment. Check you connection and try again" +msgstr "Impossible d'accepter le paiement. Vérifiez votre connexion internet et réessayez" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment. Check you connection and try again" +msgstr "Impossible de diffuser le paiement. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js msgid "Could not connect wallet service. Check your Internet connexion and your wallet service configuration." msgstr "Impossible de se connecter au service de portefeuille. Vérifiez votre connexion Internet et la configuration de votre service de portefeuille." +#: src/js/controllers/walletHome.js +msgid "Could not create address. Check you connection and try again" +msgstr "Impossible de créer l'adresse. Vérifiez votre connexion internet et réessayez" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "Impossible de créer la proposition de paiement" + #: src/js/services/profileService.js msgid "Could not create using the specified extended private key" msgstr "Impossible de créer en utilisant la clé privée étendue spécifiée" @@ -191,8 +249,8 @@ msgid "Could not decrypt file, check your password" msgstr "Impossible de déchiffrer le fichier, vérifiez votre mot de passe" #: src/js/controllers/walletHome.js -msgid "Could not delete transaction. Please try again." -msgstr "Impossible de supprimer la transaction. Veuillez réessayer." +msgid "Could not delete payment proposal. Check you connection and try again" +msgstr "Impossible de supprimer la proposition de paiement. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -215,29 +273,29 @@ msgid "Could not join wallet:" msgstr "Impossible de rejoindre le portefeuille" #: src/js/controllers/walletHome.js -msgid "Could not reject transaction. Please try again." -msgstr "Impossible de rejeter la transaction. Veuillez réessayer." +msgid "Could not reject payment. Check you connection and try again" +msgstr "Impossible de rejeter le paiement. Vérifiez votre connexion internet réessayez" #: src/js/controllers/walletHome.js -msgid "Could not send transaction. Please try again." -msgstr "Impossible d'envoyer la transaction. Veuillez réessayer." - -#: src/js/controllers/walletHome.js -msgid "Could not sign transaction. Please try again." -msgstr "Impossible de signer la transaction. Veuillez réessayer." +msgid "Could not send payment" +msgstr "Impossible d'envoyer le paiement" #: public/views/walletHome.html msgid "Could not update Wallet" msgstr "Impossible de mettre à jour le portefeuille" -#: public/views/create.html #: public/views/walletHome.html msgid "Create" msgstr "Créer" #: public/views/add.html +#: public/views/create.html msgid "Create new wallet" -msgstr "Créer un nouveau portefeuille" +msgstr "Créer" + +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "Créer un portefeuille {{requiredCopayers}}-sur-{{totalCopayers}}" #: public/views/includes/sidebar.html msgid "Create, join or import" @@ -247,8 +305,11 @@ msgstr "Créer, rejoindre ou importer" msgid "Created by" msgstr "Créée par" +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Création du profile..." + #: public/views/create.html -#: public/views/splash/1.html msgid "Creating Wallet..." msgstr "Création du portefeuille..." @@ -260,6 +321,10 @@ msgstr "Création de la transaction" msgid "Date" msgstr "Date" +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Supprimer la proposition de paiement" + #: public/views/preferencesAdvanced.html msgid "Delete Wallet" msgstr "Supprimer le portefeuille" @@ -273,8 +338,23 @@ msgid "Delete wallet" msgstr "Supprimer le portefeuille" #: src/js/controllers/walletHome.js -msgid "Deleting transaction" -msgstr "Suppression de la transaction" +msgid "Deleting payment" +msgstr "Suppression du paiement" + +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "Détails" + +#: src/js/controllers/index.js +msgid "Deutsch" +msgstr "Allemand" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Désactivé" #: public/views/backup.html msgid "Download backup" @@ -284,6 +364,18 @@ msgstr "Télécharger la sauvegarde" msgid "ENTER" msgstr "ENTRER" +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "Économique" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Notifications e-mail" + +#: src/js/controllers/preferencesFee.js +msgid "Emergency" +msgstr "Urgente" + #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Chiffrer la clé privée" @@ -323,7 +415,11 @@ msgstr "Impossible d'importer les portefeuilles" #: public/views/create.html msgid "Family vacation funds" -msgstr "Fonds pour les vacances familiales." +msgstr "Fonds pour les vacances familiales" + +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Frais" #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js @@ -338,22 +434,38 @@ msgstr "Français" msgid "Funds received" msgstr "Fonds reçus" -#: public/views/splash/1.html +#: public/views/splash.html msgid "GET STARTED" msgstr "COMMENCER" +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "Générer un code QR" + #: public/views/walletHome.html msgid "Generate new address" msgstr "Générer une nouvelle adresse" +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "Obtention d'une adresse pour le portefeuille {{selectedWalletName}} ..." + #: public/views/preferences.html msgid "Global settings" msgstr "Paramètres globaux" +#: public/views/disclaimer.html +msgid "Go back" +msgstr "Retour" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Vous avez une sauvegarde de Copay v0.9 ?" + #: public/views/create.html #: public/views/join.html -msgid "Hide" -msgstr "Masquer" +msgid "Hide Advanced options" +msgstr "Masquer les options avancées" #: src/js/controllers/index.js msgid "History" @@ -363,10 +475,11 @@ msgstr "Historique" msgid "Home" msgstr "Accueil" -#: public/views/create.html -msgid "If not given, a random key will be generated" -msgstr "Si non spécifié, une clé aléatoire sera générée" +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "Je confirme que j'ai lu, compris et suis d'accord avec ces conditions." +#: public/views/create.html #: public/views/join.html msgid "If not given, a secure key will be generated" msgstr "Si non spécifié, une clé sécurisée sera générée" @@ -376,20 +489,21 @@ msgid "Import" msgstr "Importer" #: public/views/import.html +#: public/views/splash.html msgid "Import backup" -msgstr "Importer une sauvegarde" - -#: public/views/add.html -msgid "Import from Copay Beta 0.9" -msgstr "Importer depuis Copay Beta 0.9" +msgstr "Importer la sauvegarde" #: public/views/importLegacy.html msgid "Import from the Cloud?" msgstr "Importer depuis le Cloud ?" +#: public/views/import.html +msgid "Import here" +msgstr "Importer ici" + #: public/views/add.html msgid "Import wallet" -msgstr "Importer un portefeuille" +msgstr "Importer" #: public/views/import.html msgid "Importing wallet..." @@ -399,11 +513,6 @@ msgstr "Importation du portefeuille..." msgid "Importing..." msgstr "Importation..." -#: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html -msgid "Information" -msgstr "Informations" - #: src/js/controllers/index.js msgid "Japanese" msgstr "Japonais" @@ -419,7 +528,7 @@ msgstr "Rejoindre" #: public/views/add.html msgid "Join shared wallet" -msgstr "Rejoindre un portefeuille partagé" +msgstr "Rejoindre" #: public/views/join.html msgid "Joining Wallet..." @@ -438,6 +547,7 @@ msgid "Make a payment to" msgstr "Faire un paiement à" #: public/views/create.html +#: public/views/join.html msgid "Master extended private key" msgstr "Clé privée étendue maîtresse" @@ -478,8 +588,8 @@ msgid "Network" msgstr "Réseau" #: src/js/services/notificationsService.js -msgid "New Transaction" -msgstr "Nouvelle transaction" +msgid "New Payment Proposal" +msgstr "Nouvelle proposition de paiement" #: public/views/modals/confirmation.html msgid "No" @@ -489,7 +599,12 @@ msgstr "Non" msgid "No transactions yet" msgstr "Aucune transaction" -#: public/views/walletHome.html +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "Normale" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Not valid" msgstr "Non valide" @@ -503,6 +618,11 @@ msgstr "Note :" msgid "OKAY" msgstr "Ok" +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Participants" +msgstr "Participants" + #: public/views/import.html #: public/views/importLegacy.html msgid "Password" @@ -520,39 +640,88 @@ msgstr "Mot de passe nécessaire" msgid "Passwords do not match" msgstr "Le mot de passe ne correspond pas" -#: public/views/import.html -msgid "Paste backup plain text code" -msgstr "Coller le code texte de sauvegarde" - #: public/views/join.html msgid "Paste invitation here" msgstr "Collez l'invitation ici" +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Collez le code texte de sauvegarde" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Payer à" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "Paiement accepté" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Proposition de paiement" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Proposition de paiement créée" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Proposition de paiement rejetée" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Proposition de paiement rejetée par les Copayer" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Proposition de paiement signée par les Copayers" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Propositions de paiement" + #: src/js/controllers/walletHome.js msgid "Payment Protocol not supported on Chrome App" msgstr "Le protocole de paiement n'est pas supporté sur l'application Chrome" #: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "Paiement rejeté" + +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js msgid "Payment Sent" msgstr "Paiement envoyé" +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "Paiement accepté..." + #: public/views/modals/txp-details.html msgid "Payment details" -msgstr "Détails de paiement" +msgstr "Détails du paiement" + +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "Paiement finalement rejeté" #: public/views/modals/paypro.html -msgid "Payment protocol request" -msgstr "Demande de protocole de paiement" +msgid "Payment request" +msgstr "Demande de paiement" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "Paiement envoyé !" #: public/views/walletHome.html msgid "Payment to" msgstr "Paiement à" #: public/views/preferencesDeleteWallet.html -msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED" +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "Supprimer définitivement ce portefeuille. CETTE ACTION NE PEUT PAS ÊTRE ANNULÉE" -#: public/views/walletHome.html +#: public/views/create.html msgid "Personal Wallet" msgstr "Portefeuille personnel" @@ -565,10 +734,26 @@ msgstr "Veuillez saisir les champs requis" msgid "Please, select your backup file" msgstr "Veuillez sélectionner votre fichier de sauvegarde" +#: src/js/controllers/index.js +msgid "Portuguese" +msgstr "Portugais" + #: public/views/walletHome.html msgid "Preferences" msgstr "Préférences" +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "Prioritaire" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "Code QR" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "QR-Scanner" + #: src/js/controllers/index.js msgid "Receive" msgstr "Recevoir" @@ -594,28 +779,29 @@ msgid "Reject" msgstr "Rejeter" #: src/js/controllers/walletHome.js -msgid "Rejecting transaction" -msgstr "" +msgid "Rejecting payment" +msgstr "Rejet du paiement" #: public/views/preferencesAbout.html msgid "Release Information" -msgstr "Libérer l'information" - -#: public/views/modals/txp-details.html -msgid "Remove transaction" -msgstr "Supprimer la transaction" +msgstr "Informations de version" #: public/views/backup.html #: public/views/includes/password.html msgid "Repeat password" msgstr "Répétez le mot de passe" +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "Demander un montant précis" + #: public/views/import.html #: public/views/join.html msgid "Required" msgstr "Requis" -#: public/views/splash/1.html +#: public/views/splash.html msgid "Retrying..." msgstr "Nouvelle tentative" @@ -627,9 +813,15 @@ msgstr "DEFINIR" msgid "SKIP BACKUP" msgstr "IGNORER" +#: public/views/preferencesAlias.html #: public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html msgid "Save" -msgstr "Sauvegarder" +msgstr "Enregistrer" + +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Enregistrement des préférences..." #: src/js/services/notificationsService.js msgid "Scan Finished" @@ -660,7 +852,7 @@ msgid "Select a wallet" msgstr "Sélectionner un portefeuille" #: public/views/create.html -msgid "Select required signatures" +msgid "Select required number of signatures" msgstr "Sélectionnez le nombre de signatures requises" #: public/views/create.html @@ -673,6 +865,10 @@ msgstr "Sélectionnez le nombre total de copayers" msgid "Send" msgstr "Envoyer" +#: public/views/walletHome.html +msgid "Send All" +msgstr "Tout envoyer" + #: public/views/backup.html #: public/views/preferencesLogs.html msgid "Send by email" @@ -698,6 +894,10 @@ msgstr "Définissez un mot de passe pour votre sauvegarde" msgid "Set up a password" msgstr "Définir un mot de passe" +#: public/views/preferencesEmail.html +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "Définir des notifications e-mail peut affaiblir votre vie privée si le fournisseur du service de portefeuille est compromis. Les informations disponibles à un attaquant incluent les adresses de votre portefeuille et leurs soldes, mais rien de plus." + #: public/views/walletHome.html msgid "Share address" msgstr "Partager l'adresse" @@ -707,26 +907,25 @@ msgid "Share invitation" msgstr "Partager l'invitation" #: public/views/copayers.html -msgid "Share this secret with your copayers" -msgstr "Partagez ce secret avec vos copayers" +msgid "Share this invitation with your copayers" +msgstr "Partagez cette invitation avec vos copayers" #: 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 "Partagez ceci avec quiconque pour recevoir des paiements. Pour protéger votre anonymat, de nouvelles adresses sont générées automatiquement une fois que vous les utilisez." +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Partagez cette adresse de portefeuille pour recevoir des paiements. Pour protéger votre anonymat, de nouvelles adresses sont générées automatiquement une fois que vous les utilisez." -#: public/views/create.html +#: public/views/create.html +msgid "Shared Wallet" +msgstr "Portefeuille partagé" + +#: public/views/create.html #: public/views/join.html -msgid "Show" -msgstr "Montrer" +msgid "Show Advanced options" +msgstr "Montrer les options avancées" -#: public/views/modals/txp-details.html -msgid "Sign" -msgstr "Signer" - -#: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html -msgid "Signatures" -msgstr "Signatures" +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Signature du paiement" #: src/js/controllers/walletHome.js msgid "Signing transaction" @@ -750,34 +949,58 @@ msgstr "Succès" msgid "Tap to retry" msgstr "Tapez pour réessayer" +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "Conditions d'utilisation" + +#: public/views/create.html +msgid "Testnet" +msgstr "Testnet" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be completed. Please try again from home screen" +msgstr "Le paiement a été créé mais n'a pas pu être achevé. Veuillez réessayer depuis l'écran d'accueil" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be signed. Please try again from home screen." +msgstr "Le paiement a été créé mais n'a pas pu être signé. Veuillez réessayer depuis l'écran d'accueil" + #: public/views/modals/txp-details.html -msgid "The transaction was removed by creator" -msgstr "La transaction a été supprimée par le créateur" +msgid "The payment was removed by creator" +msgstr "Le paiement a été supprimé par le créateur" + +#: 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." +msgstr "La clé privée pour ce portefeuille est chiffrée. Exporter une sauvegarde conservera le chiffrement de la clé dans l'archive de sauvegarde." + +#: public/views/disclaimer.html +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "Le logiciel que vous êtes sur le point d'utiliser fonctionne comme un portefeuille numérique gratuit, open source et multi-signatures.\nLe logiciel ne constitue pas un compte où BitPay, ou des tiers, agissent comme des intermédiaires financiers ou dépositaires de vos bitcoins.\nBien que le logiciel ait subi des tests bêta et continue d'être amélioré par les commentaires d'utilisateurs et de développeurs de la communauté open source, nous ne pouvons pas garantir qu'il n'y aura plus de bugs dans le logiciel.\nVous reconnaissez que votre utilisation de ce logiciel est à votre propre discrétion et est en conformité avec toutes les lois applicables.\nVous êtes responsable de la sauvegarde de vos mots de passe, paires de clés privées, codes PIN et autres codes que vous utilisez pour accéder au logiciel.\nSI VOUS PERDEZ L'ACCÈS À VOTRE PORTEFEUILLE COPAY OU À VOS CLÉS PRIVÉES CHIFFRÉES ET QUE VOUS N'AVEZ PAS ENTREPOSÉ SÉPARÉMENT UNE SAUVEGARDE DE VOTRE PORTEFEUILLE ET LES MOTS DE PASSE CORRESPONDANT, VOUS RECONNAISSEZ ET ACCEPTEZ QUE LES BITCOINS QUE VOUS AVEZ ASSOCIÉ À CE PORTEFEUILLE COPAY DEVIENNENT INACCESSIBLES.\nToutes les transactions sont irréversibles.\nLes auteurs de ce logiciel, employés et sociétés affiliés à BitPay, détenteurs de droits d'auteur, et BitPay, Inc. ne peuvent pas récupérer vos clés privées ou mots de passe si vous les perdez et ne peuvent pas garantir la confirmation des transactions étant donné qu'ils n'ont pas de contrôle sur le réseau Bitcoin.\nDans toute la mesure permise par la loi, ce logiciel est fourni “tel quel” et aucune représentation ou garantie ne peut être faite de toute nature, expresse ou implicite, y compris, mais sans s'y limiter, les garanties de qualité marchande, la conformité ou un usage particulier et absent de contrefaçon.\nVous assumez tous les risques associés à l'utilisation du logiciel.\nEn aucun cas les auteurs des logiciels, employés et sociétés affiliés de Bitpay, détenteurs de droits d'auteur, ou BitPay, Inc. ne peuvent être tenus responsables de toute réclamation, dommages ou autre responsabilité, que ce soit dans une action contractuelle, délictuelle ou autre, découlant ou en étant en connexion avec le logiciel.\nNous nous réservons le droit de modifier cette clause de temps à autre." #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" msgstr "Le portefeuille \"{{walletName}}\" a été supprimé" +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "Il n'y a pas de portefeuilles pour faire ce paiement" + #: src/js/controllers/import.js msgid "There is an error in the form" msgstr "Il y a une erreur dans la forme" -#: public/views/backup.html -msgid "This wallet have its private key encrypted. Exporting a backup will keep the private key encrypted on the backup." -msgstr "Ce portefeuille a sa clé privée chiffrée. Exporter une sauvegarde gardera la clé privée chiffrée lors de la sauvegarde." - #: public/views/walletHome.html msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "Ce portefeuille n'est pas enregistré dans le Bitcore Wallet Service (BWS).Vous pouvez le recréer depuis l'information locale." #: public/views/modals/txp-details.html msgid "Time" -msgstr "Temps" +msgstr "Heure" #: 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" @@ -791,54 +1014,6 @@ msgstr "Solde verrouillé total" msgid "Transaction" msgstr "Transaction" -#: src/js/services/notificationsService.js -msgid "Transaction Rejected" -msgstr "Transaction rejetée" - -#: src/js/services/notificationsService.js -msgid "Transaction Sent" -msgstr "Transaction envoyée" - -#: src/js/services/notificationsService.js -msgid "Transaction Signed" -msgstr "Transaction signée" - -#: public/views/modals/txp-details.html -msgid "Transaction accepted..." -msgstr "Transaction acceptée..." - -#: src/js/services/txStatus.js -msgid "Transaction broadcasted" -msgstr "Transaction diffusée" - -#: public/views/modals/txp-details.html -msgid "Transaction finally rejected" -msgstr "Transaction finalement rejetée" - -#: src/js/controllers/walletHome.js -msgid "Transaction not broadcasted. Please try again." -msgstr "Transaction non diffusée. Veuillez réessayer." - -#: public/views/modals/txp-details.html -msgid "Transaction proposal" -msgstr "Proposition de transaction" - -#: src/js/services/txStatus.js -msgid "Transaction proposal created" -msgstr "Proposition de transaction créée" - -#: src/js/services/txStatus.js -msgid "Transaction proposal signed" -msgstr "Proposition de transaction signée" - -#: public/views/modals/txp-details.html -msgid "Transaction sent!" -msgstr "Transaction envoyée !" - -#: src/js/services/txStatus.js -msgid "Transaction was rejected" -msgstr "La transaction a été rejetée" - #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "Impossible d'envoyer la proposition de transaction" @@ -864,10 +1039,6 @@ msgstr "Non-approuvé" msgid "Updating Wallet..." msgstr "Mise à jour du portefeuille..." -#: public/views/create.html -msgid "Use test network" -msgstr "Utiliser le réseau de test" - #: public/views/preferencesAbout.html msgid "Version" msgstr "Version" @@ -884,7 +1055,7 @@ msgstr "ATTENTION : Sauvegarde nécessaire" msgid "WARNING: Wallet not registered" msgstr "ATTENTION : Portefeuille non enregistré" -#: public/views/splash/1.html +#: public/views/splash.html msgid "WELCOME TO COPAY" msgstr "BIENVENUE SUR COPAY" @@ -896,6 +1067,10 @@ msgstr "Attente des copayers" msgid "Waiting..." msgstr "Attente..." +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Alias de portefeuille" + #: src/js/services/profileService.js msgid "Wallet Already Imported:" msgstr "Portefeuille déjà importé :" @@ -937,7 +1112,7 @@ msgid "Yes" msgstr "Oui" #: public/views/walletHome.html -msgid "You do not have any wallet" +msgid "You do not have a wallet" msgstr "Vous n'avez aucun portefeuille" #: public/views/backup.html @@ -962,17 +1137,15 @@ msgstr "Votre mot de passe de profil" msgid "Your wallet has been imported correctly" msgstr "Votre portefeuille a été correctement importé" -#: public/views/create.html -#: public/views/join.html -msgid "advanced options" -msgstr "les options avancées" +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "e-mail pour les notifications de portefeuille" #: public/views/walletHome.html -msgid "in pending transactions" -msgstr "dans les transactions en attente" +msgid "locked by pending payments" +msgstr "verrouillés par les paiements en attente" #: public/views/copayers.html -#: public/views/create.html #: public/views/walletHome.html #: public/views/includes/sidebar.html msgid "of" @@ -982,17 +1155,21 @@ msgstr "de" msgid "optional" msgstr "optionnel" +#: public/views/preferences.html +msgid "settings" +msgstr "paramètres" + #: public/views/walletHome.html msgid "too long!" msgstr "trop long !" -#: public/views/create.html -msgid "wallet" -msgstr "portefeuille" +#: public/views/preferencesFee.html +msgid "{{fee.value}} bits per kB" +msgstr "{{fee.value}} bits par kB" -#: public/views/preferences.html -msgid "{{index.walletName}} settings" -msgstr "{{index.walletName}} paramètres" +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}} seront déduits pour les frais de réseau Bitcoin" #: src/js/controllers/importLegacy.js msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" diff --git a/po/ja.po b/po/ja.po index 6969d0753..b4c873b3f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -14,36 +14,40 @@ msgstr "" #: public/views/modals/txp-details.html msgid "" -"* Only transactions created by yourself with no peer signatures can be " -"removed" +"* A payment proposal can be deleted if 1) you are the creator, and no other " +"copayer has signed, or 2) 24 hours have passed since the proposal was " +"created." msgstr "" -"* 自分が提案した取引で他の参加者が署名していない取引提案のみ破棄されます。" +"* 送金の提案の取下げは①他のウォレット参加者に署名されていなかった場合、提案者" +"に提案を取り下げることができます。②提案の起案から24時間が経っても解決しなかっ" +"た場合、全員に取り下げることができます。" #: public/views/backup.html msgid "" -"* You can safely install your backup on other device and use your wallet " -"from many devices at the same time." +"* You can safely install your backup on another device and use your wallet " +"from multiple devices at the same time." msgstr "" "* 安全にバックアップを別のデバイスにインポートして、同じウォレットを複数の端" "末でご利用いただけます。" -#: public/views/splash/1.html +#: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "マルチシグネチャビットコインウォレット" -#: src/js/services/notificationsService.js -msgid "A transaction was finally rejected" -msgstr "取引がようやく却下されました" - #: public/views/preferences.html msgid "About Copay" msgstr "Copayについて" +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "承諾" + #: public/views/includes/sidebar.html msgid "Add wallet" msgstr "ウォレットを追加" -#: public/views/paymentUri.html +#: public/views/paymentUri.html public/views/modals/customized-amount.html +#: public/views/modals/paypro.html msgid "Address" msgstr "アドレス" @@ -51,16 +55,29 @@ msgstr "アドレス" msgid "Advanced" msgstr "上級者向け" +#: public/views/disclaimer.html +msgid "Agree" +msgstr "同意します" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "{{index.walletName}} の通称設定" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "すでにウォレットをお持ちですか？" + #: public/views/preferences.html msgid "Alternative Currency" msgstr "表示通貨" #: public/views/paymentUri.html public/views/walletHome.html +#: public/views/modals/customized-amount.html #: public/views/modals/txp-details.html msgid "Amount" msgstr "金額" -#: public/views/walletHome.html +#: public/views/walletHome.html public/views/modals/customized-amount.html msgid "Amount in" msgstr "換算済金額" @@ -70,13 +87,20 @@ msgstr "変更を反映" #: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js msgid "Are you sure you want to delete this wallet?" -msgstr "本当にこのウォレットを削除しても宜しいですか？" +msgstr "" +"本当にこのウォレットを削除しても\n" +"宜しいですか？" #: public/views/walletHome.html msgid "Available Balance" msgstr "送金可能残高" -#: public/views/includes/topbar.html +#: public/views/create.html public/views/join.html +msgid "BIP32 master extended private key" +msgstr "マスタ拡張秘密鍵" + +#: public/views/includes/topbar.html public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Back" msgstr "戻る" @@ -103,6 +127,10 @@ msgstr "" "ビットコインをもらう前に、このウォレットのバックアップすることを強くおすすめ" "します。" +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "ビットコインネットワークの手数料設定" + #: public/views/paymentUri.html msgid "Bitcoin URI is NOT valid!" msgstr "Bitcoin URI が無効です！" @@ -111,10 +139,26 @@ msgstr "Bitcoin URI が無効です！" msgid "Bitcoin address" msgstr "ビットコインアドレス" +#: public/views/preferencesFee.html +msgid "" +"Bitcoin transactions may include a fee collected by miners on the network. " +"The higher the fee, the greater the incentive a miner has to include that " +"transaction in a block. The ‘Emergency’ level should only be used when there " +"is a network congestion." +msgstr "" +"円滑な送金をしていただくために、ビットコインの送金には少量の手数料を付けるこ" +"とが義務付けられております。この手数料はビットコインのネットワークを運用する" +"人たちに寄付され、より高い手数料であればより優先的にブロックに含まれ、承認さ" +"れます。「緊急」の設定はネットワーク全体の混雑時にのみご利用下さい。" + #: public/views/modals/txp-details.html -msgid "Broadcast Transaction" +msgid "Broadcast Payment" msgstr "取引送信" +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "取引送信中" + #: src/js/controllers/walletHome.js msgid "Broadcasting transaction" msgstr "取引送信中" @@ -139,13 +183,25 @@ msgstr "キャンセル" msgid "Certified by" msgstr "証明元：" +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "ウォレット通称を変更しても、この端末でしか変わりません。" + +#: src/js/controllers/walletHome.js +msgid "Check you connection and try again" +msgstr "接続を確認し、やり直して下さい。" + #: public/views/import.html -msgid "Choose backup file from your computer" +msgid "Choose a backup file from your computer" msgstr "パソコンからバックアップファイルを選択して下さい。" +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "送金元のウォレットを選択して下さい" + #: 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 +#: public/views/modals/customized-amount.html public/views/modals/paypro.html +#: public/views/modals/scanner.html public/views/modals/wallets.html msgid "Close" msgstr "閉じる" @@ -155,22 +211,22 @@ msgstr "色" #: public/views/preferencesAbout.html msgid "Commit hash" -msgstr "ハッシュをコミット" +msgstr "コミットのハッシュ値" #: public/views/modals/tx-details.html msgid "Confirmations" -msgstr "承認回数：" +msgstr "承認回数" #: public/views/modals/copayers.html msgid "Copayers" msgstr "ウォレット参加者" #: public/views/backup.html -msgid "Copy backup in a safe place" +msgid "Copy backup to a safe place" msgstr "安全な場所でバックアップを保管して下さい" #: public/views/backup.html -msgid "Copy this text as it is in a safe place (notepad or email)" +msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "" "このテキストを安全な場所に貼り付けて保管して下さい (メモ帳やメールの下書きな" "ど)" @@ -179,6 +235,30 @@ msgstr "" msgid "Copy to clipboard" msgstr "クリップボードへコピー" +#: src/js/controllers/walletHome.js +msgid "Could not accept payment. Check you connection and try again" +msgstr "送金の提案が承諾できませんでした。接続を確認し、やり直して下さい。" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment. Check you connection and try again" +msgstr "送金できませんでした。接続を確認し、やり直して下さい。" + +#: src/js/controllers/walletHome.js +msgid "" +"Could not connect wallet service. Check your Internet connexion and your " +"wallet service configuration." +msgstr "" +"ウォレットサービスと接続できませんでした。インターネットの接続とウォレット" +"サービスの設定を確認して下さい。" + +#: src/js/controllers/walletHome.js +msgid "Could not create address. Check you connection and try again" +msgstr "アドレスが生成できませんでした。接続を確認し、やり直して下さい。" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "送金の提案を作成できませんでした" + #: src/js/services/profileService.js msgid "Could not create using the specified extended private key" msgstr "指定された拡張秘密鍵で作成できませんでした。" @@ -187,6 +267,10 @@ msgstr "指定された拡張秘密鍵で作成できませんでした。" msgid "Could not decrypt file, check your password" msgstr "複合化できませんでした。パスワードが正しいかご確認下さい。" +#: src/js/controllers/walletHome.js +msgid "Could not delete payment proposal. Check you connection and try again" +msgstr "送金の提案が削除できませんでした。接続を確認し、やり直して下さい。" + #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" msgstr "支払い情報が取得できませんでした。" @@ -208,27 +292,43 @@ msgstr "指定された拡張秘密鍵で参加できませんでした。" msgid "Could not join wallet:" msgstr "ウォレットに参加できませんでした。" +#: src/js/controllers/walletHome.js +msgid "Could not reject payment. Check you connection and try again" +msgstr "送金の提案を却下できませんでした。接続を確認し、やり直して下さい。" + +#: src/js/controllers/walletHome.js +msgid "Could not send payment" +msgstr "送金できませんでした。" + #: public/views/walletHome.html msgid "Could not update Wallet" msgstr "ウォレットが更新できませんでした。" -#: public/views/create.html public/views/walletHome.html +#: public/views/walletHome.html msgid "Create" msgstr "作成" -#: public/views/add.html +#: public/views/add.html public/views/create.html msgid "Create new wallet" msgstr "新規ウォレット作成" +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "{{requiredCopayers}}-of-{{totalCopayers}} ウォレットを作成" + #: public/views/includes/sidebar.html msgid "Create, join or import" -msgstr "新規作成、既存参加、若しくはインポート" +msgstr "作成、参加、インポート" #: public/views/modals/txp-details.html msgid "Created by" msgstr "作成者：" -#: public/views/create.html public/views/createProfile.html +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "ウォレット作成中…" + +#: public/views/create.html msgid "Creating Wallet..." msgstr "ウォレット作成中…" @@ -240,6 +340,10 @@ msgstr "取引作成中…" msgid "Date" msgstr "日付" +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "送金の提案を削除" + #: public/views/preferencesAdvanced.html msgid "Delete Wallet" msgstr "ウォレットを削除" @@ -253,9 +357,22 @@ msgid "Delete wallet" msgstr "ウォレットを削除" #: src/js/controllers/walletHome.js -msgid "Deleting transaction" +msgid "Deleting payment" msgstr "取引削除中…" +#: public/views/modals/customized-amount.html public/views/modals/paypro.html +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "Details" +msgstr "詳細" + +#: src/js/controllers/index.js +msgid "Deutsch" +msgstr "ドイツ語" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "無効" + #: public/views/backup.html msgid "Download backup" msgstr "バックアップをダウンロード" @@ -264,6 +381,18 @@ msgstr "バックアップをダウンロード" msgid "ENTER" msgstr "ENTER" +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "節約" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "メールのお知らせ" + +#: src/js/controllers/preferencesFee.js +msgid "Emergency" +msgstr "緊急" + #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "秘密鍵を暗号化" @@ -304,6 +433,10 @@ msgstr "ウォレットのインポート失敗しました" msgid "Family vacation funds" msgstr "家族旅行貯金" +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "手数料" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" @@ -317,21 +450,37 @@ msgstr "フランス語" msgid "Funds received" msgstr "着金あり" -#: public/views/splash/1.html +#: public/views/splash.html msgid "GET STARTED" msgstr "はじめよう" +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "QRコードを生成" + #: public/views/walletHome.html msgid "Generate new address" msgstr "新規アドレスを生成" +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "「{{selectedWalletName}}」のアドレスを取得中…" + #: public/views/preferences.html msgid "Global settings" msgstr "グローバル設定" +#: public/views/disclaimer.html +msgid "Go back" +msgstr "前に戻る" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Copay v0.9 のバックアップをお持ちですか？" + #: public/views/create.html public/views/join.html -msgid "Hide" -msgstr "非表示" +msgid "Hide Advanced options" +msgstr "詳細設定　非表示" #: src/js/controllers/index.js msgid "History" @@ -341,11 +490,11 @@ msgstr "履歴" msgid "Home" msgstr "ホーム" -#: public/views/create.html -msgid "If not given, a random key will be generated" -msgstr "空欄の場合、乱数を使って鍵を生成します。" +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "内容をよく読み、理解し、同意します。" -#: public/views/join.html +#: public/views/create.html public/views/join.html msgid "If not given, a secure key will be generated" msgstr "空欄の場合、安全な鍵を生成します。" @@ -353,18 +502,18 @@ msgstr "空欄の場合、安全な鍵を生成します。" msgid "Import" msgstr "インポート" -#: public/views/import.html +#: public/views/import.html public/views/splash.html msgid "Import backup" msgstr "バックアップをインポート" -#: public/views/add.html -msgid "Import from Copay Beta 0.9" -msgstr "Copay Beta 0.9からのインポート" - #: public/views/importLegacy.html msgid "Import from the Cloud?" msgstr "クラウドからのインポートを行いますか？" +#: public/views/import.html +msgid "Import here" +msgstr "ここでインポート" + #: public/views/add.html msgid "Import wallet" msgstr "ウォレットをインポート" @@ -377,10 +526,6 @@ msgstr "ウォレットインポート中…" msgid "Importing..." msgstr "インポート中…" -#: public/views/modals/tx-details.html public/views/modals/txp-details.html -msgid "Information" -msgstr "情報" - #: src/js/controllers/index.js msgid "Japanese" msgstr "日本語" @@ -413,15 +558,20 @@ msgstr "ウォレット移行について詳しく" msgid "Make a payment to" msgstr "支払いは次の宛先へ" -#: public/views/create.html +#: public/views/create.html public/views/join.html msgid "Master extended private key" msgstr "マスタ拡張秘密鍵" #: public/views/includes/copayers.html public/views/modals/copayers.html +#: public/views/modals/tx-details.html public/views/modals/txp-details.html msgid "Me" msgstr "自分" -#: public/views/modals/paypro.html public/views/modals/tx-details.html +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "メモ" + +#: public/views/modals/tx-details.html msgid "Merchant message" msgstr "お店からのメッセージ：" @@ -450,8 +600,8 @@ msgid "Network" msgstr "ネットワーク" #: src/js/services/notificationsService.js -msgid "New Transaction" -msgstr "新規取引" +msgid "New Payment Proposal" +msgstr "新しい送金の提案" #: public/views/modals/confirmation.html msgid "No" @@ -461,7 +611,11 @@ msgstr "いいえ" msgid "No transactions yet" msgstr "取引がありません" -#: public/views/walletHome.html +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "通常" + +#: public/views/walletHome.html public/views/modals/customized-amount.html msgid "Not valid" msgstr "無効です" @@ -474,6 +628,10 @@ msgstr "メモ" msgid "OKAY" msgstr "OK" +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "Participants" +msgstr "参加者" + #: public/views/import.html public/views/importLegacy.html msgid "Password" msgstr "パスワード" @@ -492,40 +650,89 @@ msgstr "パスワードが必要" msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: public/views/import.html -msgid "Paste backup plain text code" -msgstr "バックアップの文字をここに貼り付け" - #: public/views/join.html msgid "Paste invitation here" msgstr "招待コードをこちらへ貼り付けて下さい" +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "バックアップの文字をここに貼り付けて下さい" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "支払い先" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "支払いが完了しました" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "送金の提案" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "送金の提案が作成されました" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "送金の提案が却下されました" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "送金の提案が他の参加者によって却下されました。" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "送金の提案が他の参加者によって署名されました。" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "送金の提案" + #: src/js/controllers/walletHome.js msgid "Payment Protocol not supported on Chrome App" msgstr "クロームのアプリではペイメントプロトコールがサポートされていません。" #: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "送金が却下されました" + +#: public/views/modals/tx-status.html src/js/services/notificationsService.js msgid "Payment Sent" -msgstr "支払いが完了しました" +msgstr "送金が完了しました" + +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "支払いが受領されました…" #: public/views/modals/txp-details.html msgid "Payment details" msgstr "支払いの詳細" +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "送金の提案が却下されました" + #: public/views/modals/paypro.html -msgid "Payment protocol request" -msgstr "ペイメントプロトコル要求" +msgid "Payment request" +msgstr "支払い請求" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "支払いを送信しました！" #: public/views/walletHome.html msgid "Payment to" msgstr "支払い先" #: public/views/preferencesDeleteWallet.html -msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED" +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "" -"永久にこのウォレットを削除。二度と取り戻せない行為ですのどご注意下さい。" +"永久にこのウォレットを削除します。\n" +"二度と取り戻せない行為ですのどご注意下さい。" -#: public/views/walletHome.html +#: public/views/create.html msgid "Personal Wallet" msgstr "個人用ウォレット" @@ -537,10 +744,26 @@ msgstr "必須項目をご入力下さい" msgid "Please, select your backup file" msgstr "バックアップファイルを選択" +#: src/js/controllers/index.js +msgid "Portuguese" +msgstr "ポルトガル語" + #: public/views/walletHome.html msgid "Preferences" msgstr "設定" +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "優先" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "QRコード" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "QRコードを読み取って下さい" + #: src/js/controllers/index.js msgid "Receive" msgstr "受取" @@ -566,26 +789,26 @@ msgid "Reject" msgstr "却下" #: src/js/controllers/walletHome.js -msgid "Rejecting transaction" -msgstr "取引却下中…" +msgid "Rejecting payment" +msgstr "送金の提案却下中" #: public/views/preferencesAbout.html msgid "Release Information" msgstr "リリース情報" -#: public/views/modals/txp-details.html -msgid "Remove transaction" -msgstr "取引を削除" - #: public/views/backup.html public/views/includes/password.html msgid "Repeat password" msgstr "パスワードを再入力" +#: public/views/walletHome.html public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "指定金額を要求" + #: public/views/import.html public/views/join.html msgid "Required" -msgstr "必要署名" +msgstr "入力必須" -#: public/views/createProfile.html +#: public/views/splash.html msgid "Retrying..." msgstr "再度試しています…" @@ -597,10 +820,15 @@ msgstr "指定" msgid "SKIP BACKUP" msgstr "バックアップをスキップ" -#: public/views/preferencesBwsUrl.html +#: public/views/preferencesAlias.html public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html msgid "Save" msgstr "保存" +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "設定を保存中…" + #: src/js/services/notificationsService.js msgid "Scan Finished" msgstr "スキャン完了" @@ -619,7 +847,7 @@ msgstr "ウォレット残高照会中…" #: public/views/modals/tx-details.html msgid "See it on the blockchain" -msgstr "ブロックチェーンで詳細閲覧" +msgstr "ブロックチェーンで詳細を閲覧" #: public/views/import.html msgid "Select a backup file" @@ -630,7 +858,7 @@ msgid "Select a wallet" msgstr "ウォレットを選択" #: public/views/create.html -msgid "Select required signatures" +msgid "Select required number of signatures" msgstr "必要な署名の数を選択" #: public/views/create.html @@ -642,6 +870,10 @@ msgstr "参加人数を選択して下さい。" msgid "Send" msgstr "送信" +#: public/views/walletHome.html +msgid "Send All" +msgstr "全額を送金" + #: public/views/backup.html public/views/preferencesLogs.html msgid "Send by email" msgstr "メールで送信" @@ -654,6 +886,10 @@ msgstr "送金済み" msgid "Server" msgstr "サーバー" +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "セッションのログ" + #: public/views/backup.html msgid "Set up a Password for your backup" msgstr "バックアップのパスワードを設定して下さい" @@ -662,6 +898,16 @@ msgstr "バックアップのパスワードを設定して下さい" msgid "Set up a password" msgstr "パスワードを設定" +#: public/views/preferencesEmail.html +msgid "" +"Setting up email notifications could weaken your privacy, if the wallet " +"service provider is compromised. Information available to an attacker would " +"include your wallet addresses and its balance, but no more." +msgstr "" +"メールのお知らせを有効にすると、悪意のあるサーバー運用者ならあなたの全てのア" +"ドレスとそれぞれの残高・履歴情報が把握できプライバシーの侵害に繋がる可能性が" +"あります。" + #: public/views/walletHome.html msgid "Share address" msgstr "アドレスを共有" @@ -672,28 +918,31 @@ msgstr "招待コードを共有" #: public/views/copayers.html msgid "Share this invitation with your copayers" -msgstr "ウォレット参加者にこの招待コードを送って下さい。" +msgstr "" +"ウォレット参加者に\n" +"この招待コードを\n" +"送って下さい。" #: 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." +"Share this wallet address to receive payments. To protect your privacy, new " +"addresses are generated automatically once you use them." msgstr "" "これを人に共有することでビットコインを送ってもらうことができます。プライバ" "シー向上の観点から、アドレスが1回でも使用されたら新しいアドレスが自動生成され" "ます。" +#: public/views/create.html +msgid "Shared Wallet" +msgstr "共有ウォレットに参加" + #: public/views/create.html public/views/join.html -msgid "Show" -msgstr "表示" +msgid "Show Advanced options" +msgstr "詳細設定　表示" -#: public/views/modals/txp-details.html -msgid "Sign" -msgstr "署名する" - -#: public/views/modals/tx-details.html public/views/modals/txp-details.html -msgid "Signatures" -msgstr "署名" +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "送金の提案署名中" #: src/js/controllers/walletHome.js msgid "Signing transaction" @@ -703,10 +952,6 @@ msgstr "取引署名中" msgid "Spanish" msgstr "スペイン語" -#: public/views/walletHome.html -msgid "Spend proposals" -msgstr "取引提案" - #: src/js/controllers/copayers.js src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js msgid "Success" @@ -716,26 +961,143 @@ msgstr "成功" msgid "Tap to retry" msgstr "タップしてやり直し" +#: public/views/disclaimer.html public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "利用規約" + +#: public/views/create.html +msgid "Testnet" +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 -msgid "The transaction was removed by creator" -msgstr "取引が作成者により削除されました" +msgid "The payment was removed by creator" +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 +msgid "" +"The private key for this wallet is encrypted. Exporting a backup will keep " +"the private key encrypted in the backup archive." +msgstr "" +"このウォレットの秘密鍵が暗号化されています。バックアップをエクスポートすると" +"秘密鍵が暗号化された状態でバックアップアーカイブとして守られます。" + +#: public/views/disclaimer.html +msgid "" +"The software you are about to use functions as a free, open source, and " +"multi-signature digital wallet. The software does not constitute an account " +"where BitPay or other third parties serve as financial intermediaries or " +"custodians of your bitcoin. While the software has undergone beta testing " +"and continues to be improved by feedback from the open-source user and " +"developer community, we cannot guarantee that there will be no bugs in the " +"software. You acknowledge that your use of this software is at your own " +"discretion and in compliance with all applicable laws. You are responsible " +"for safekeeping your passwords, private key pairs, PINs and any other codes " +"you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR " +"YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF " +"YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY " +"BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME " +"INACCESSIBLE. All transaction requests are irreversible. The authors of the " +"software, employees and affiliates of Bitpay, copyright holders, and BitPay, " +"Inc. cannot retrieve your private keys or passwords if you lose or forget " +"them and cannot guarantee transaction confirmation as they do not have " +"control over the Bitcoin network. To the fullest extent permitted by law, " +"this software is provided “as is” and no representations or warranties can " +"be made of any kind, express or implied, including but not limited to the " +"warranties of merchantability, fitness or a particular purpose and " +"noninfringement. You assume any and all risks associated with the use of the " +"software. In no event shall the authors of the software, employees and " +"affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for " +"any claim, damages or other liability, whether in an action of contract, " +"tort, or otherwise, arising from, out of or in connection with the software. " +"We reserve the right to modify this disclaimer from time to time." +msgstr "" +"当ソフトウェアは無料のオープンソースプロジェクトで、マルチシグネチャを用いる" +"デジタルウォレットです。BitPay, Inc. 若しくはその他の第三者がアクセス権限を管" +"理する、若しくはデジタル資産の代理保管を行うサービスではありません。このソフ" +"トは長いテスト期間を経てリリースしましたが、今後バグや不具合が見つからないと" +"いう保障はございません。この規約に同意することで、自己責任で利用するものと" +"し、このソフトを用いてお住まいの地域の法令の違反はしないことを意味します。こ" +"のソフトを正常に利用するために必要なパスワード、秘密鍵、暗証番号などの秘密情" +"報は自己責任で管理するものとします。＊＊＊Copayウォレットとその中にある秘密鍵" +"の情報を紛失してしまい、尚且つバックアップが無い、若しくはそのバックアップを" +"暗号化した際のパスワードが分からないなどの状況に陥ってしまえば、そのウォレッ" +"トに含まれた全てのビットコインが永久送金不可能となってしまうことを認識し、同" +"意するものとします。＊＊＊署名が完了してしまった取引は取り消しが不可能となり" +"ます。このソフトの開発者、BitPayの従業員とその関係者、著作権所有者、BitPay, " +"Inc.自体もパスワード・秘密鍵・パスワードなどへのアクセスが不可能なため、教え" +"ることがだきません、なお、ビットコインのネットワークへの影響が無いので、取引" +"の取り消しや優先的な承認などはできません。このソフトはそのままの提供となり、" +"このソフトの利用に関わるあらゆる責任とリスクを自己責任で被り、利用するものと" +"し、いかなる損害が発生しても、このソフトの開発者、BitPayの従業員とその関係" +"者、著作権所有者、BitPay, Inc.自体も責任を求めることは無いと誓います。この規" +"約の言葉や表現のニュアンスによる解釈が必要となった場合、規約の元である英語の" +"ものを正とします。和訳は簡単な要約と考えて下さい。下記に英語の規約があります" +"ので、英語が理解できる方は是非熟読して下さい。\n" +"\n" +"The software you are about to use functions as a free, open source, and " +"multi-signature digital wallet. The software does not constitute an account " +"where BitPay or other third parties serve as financial intermediaries or " +"custodians of your bitcoin. While the software has undergone beta testing " +"and continues to be improved by feedback from the open-source user and " +"developer community, we cannot guarantee that there will be no bugs in the " +"software. You acknowledge that your use of this software is at your own " +"discretion and in compliance with all applicable laws. You are responsible " +"for safekeeping your passwords, private key pairs, PINs and any other codes " +"you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR " +"YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF " +"YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY " +"BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME " +"INACCESSIBLE. All transaction requests are irreversible. The authors of the " +"software, employees and affiliates of Bitpay, copyright holders, and BitPay, " +"Inc. cannot retrieve your private keys or passwords if you lose or forget " +"them and cannot guarantee transaction confirmation as they do not have " +"control over the Bitcoin network. To the fullest extent permitted by law, " +"this software is provided “as is” and no representations or warranties can " +"be made of any kind, express or implied, including but not limited to the " +"warranties of merchantability, fitness or a particular purpose and " +"noninfringement. You assume any and all risks associated with the use of the " +"software. In no event shall the authors of the software, employees and " +"affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for " +"any claim, damages or other liability, whether in an action of contract, " +"tort, or otherwise, arising from, out of or in connection with the software. " +"We reserve the right to modify this disclaimer from time to time." #: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" msgstr "ウォレット \"{{walletName}}\" が削除されました" +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "送金可能なウォレットがありません" + #: src/js/controllers/import.js msgid "There is an error in the form" msgstr "フォームにエラーがありました" -#: public/views/backup.html -msgid "" -"This wallet have its private key encrypted. Exporting a backup will keep the " -"private key encrypted on the backup." -msgstr "" -"このウォレットの秘密鍵が暗号化されています。バックアップをエクスポートすると" -"送金時と同じパスワードが掛かった状態でエクスポートされます。" - #: public/views/walletHome.html msgid "" "This wallet is not registered at the given Bitcore Wallet Service (BWS). You " @@ -749,8 +1111,7 @@ msgid "Time" msgstr "時刻" #: 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 +#: public/views/modals/tx-details.html public/views/modals/txp-details.html msgid "To" msgstr "宛先" @@ -762,70 +1123,6 @@ msgstr "ロック中の残高" msgid "Transaction" msgstr "取引" -#: src/js/services/notificationsService.js -msgid "Transaction Rejected" -msgstr "取引が却下されました" - -#: src/js/services/notificationsService.js -msgid "Transaction Sent" -msgstr "取引送信しました！" - -#: src/js/services/notificationsService.js -msgid "Transaction Signed" -msgstr "取引署名済み" - -#: public/views/modals/txp-details.html -msgid "Transaction accepted..." -msgstr "取引受理済み…" - -#: src/js/services/txStatus.js -msgid "Transaction broadcasted" -msgstr "取引送信済み" - -#: src/js/controllers/walletHome.js -msgid "Transaction could not be deleted. Please try again." -msgstr "取引が削除できませんでした。やり直して下さい。" - -#: public/views/modals/txp-details.html -msgid "Transaction finally rejected" -msgstr "取引が却下されました" - -#: src/js/controllers/walletHome.js -msgid "Transaction not broadcasted. Please try again." -msgstr "取引が送信できませんでした。やり直して下さい。" - -#: src/js/controllers/walletHome.js -msgid "Transaction not rejected. Please try again." -msgstr "取引が却下できませんでした、再度試して見て下さい。" - -#: src/js/controllers/walletHome.js -msgid "Transaction not sent. Please try again." -msgstr "取引が送信されませんでした。やり直して下さい。" - -#: src/js/controllers/walletHome.js -msgid "Transaction not signed. Please try again." -msgstr "取引が署名されていませんでした。やり直して下さい。" - -#: public/views/modals/txp-details.html -msgid "Transaction proposal" -msgstr "取引提案" - -#: src/js/services/txStatus.js -msgid "Transaction proposal created" -msgstr "取引提案が作成されました" - -#: src/js/services/txStatus.js -msgid "Transaction proposal signed" -msgstr "取引提案が署名されました" - -#: public/views/modals/txp-details.html -msgid "Transaction sent!" -msgstr "取引送信しました！" - -#: src/js/services/txStatus.js -msgid "Transaction was rejected" -msgstr "取引が却下されました" - #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "取引提案を送れませんでした。" @@ -850,10 +1147,6 @@ msgstr "信用していない" msgid "Updating Wallet..." msgstr "ウォレット更新中…" -#: public/views/create.html -msgid "Use test network" -msgstr "テスト用ネットワークを利用" - #: public/views/preferencesAbout.html msgid "Version" msgstr "バージョン" @@ -862,10 +1155,6 @@ msgstr "バージョン" msgid "View backup" msgstr "バックアップ表示" -#: public/views/preferencesAbout.html -msgid "View session logs" -msgstr "セッションのログを表示" - #: public/views/walletHome.html msgid "WARNING: Backup needed" msgstr "注意：バックアップが必要です" @@ -874,7 +1163,7 @@ msgstr "注意：バックアップが必要です" msgid "WARNING: Wallet not registered" msgstr "注意：ウォレットが未登録" -#: public/views/splash/1.html +#: public/views/splash.html msgid "WELCOME TO COPAY" msgstr "ようこそ COPAY へ" @@ -886,6 +1175,10 @@ msgstr "ウォレット参加者を待っています" msgid "Waiting..." msgstr "少々お待ち下さい…" +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "ウォレットの通称" + #: src/js/services/profileService.js msgid "Wallet Already Imported:" msgstr "ウォレットがすでにインポート済み：" @@ -910,6 +1203,14 @@ msgstr "ウォレットが未完成で破損しています" msgid "Wallet name" msgstr "ウォレット名" +#: src/js/controllers/walletHome.js +msgid "" +"Wallet service timed out. Check your Internet connexion and your wallet " +"service configuration." +msgstr "" +"ウォレットサービスがタイムアウトになりました。インターネットの接続とウォレッ" +"トサービスの設定を確認して下さい。" + #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "注意！" @@ -923,7 +1224,7 @@ msgid "Yes" msgstr "はい" #: public/views/walletHome.html -msgid "You do not have any wallet" +msgid "You do not have a wallet" msgstr "ウォレットがありません" #: public/views/backup.html public/views/import.html @@ -932,7 +1233,7 @@ msgstr "バックアップパスワード" #: public/views/create.html public/views/join.html msgid "Your nickname" -msgstr "ニックネーム" +msgstr "自分のハンドルネーム" #: public/views/includes/password.html msgid "Your password" @@ -946,34 +1247,38 @@ msgstr "プロフィールパスワード" msgid "Your wallet has been imported correctly" msgstr "ウォレットが正常にインポートされました。" -#: public/views/create.html public/views/join.html -msgid "advanced options" -msgstr "詳細設定" +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "メールによるウォレットのお知らせ" #: public/views/walletHome.html -msgid "in pending transactions" -msgstr "未対応取引" +msgid "locked by pending payments" +msgstr "未対応送金の提案によりロック中" -#: public/views/copayers.html public/views/create.html -#: public/views/walletHome.html public/views/includes/sidebar.html +#: public/views/copayers.html public/views/walletHome.html +#: public/views/includes/sidebar.html msgid "of" -msgstr "/" +msgstr "of" #: public/views/walletHome.html msgid "optional" msgstr "任意" +#: public/views/preferences.html +msgid "settings" +msgstr "設定" + #: public/views/walletHome.html msgid "too long!" msgstr "長すぎます！" -#: public/views/create.html -msgid "wallet" -msgstr "ウォレット" +#: public/views/preferencesFee.html +msgid "{{fee.value}} bits per kB" +msgstr "1キロバイト当たり {{fee.value}} bits" -#: public/views/preferences.html -msgid "{{index.walletName}} settings" -msgstr "{{index.walletName}} 設定" +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}} のビットコインネットワーク手数料が差し引かれます。" #: src/js/controllers/importLegacy.js msgid "" diff --git a/po/pt.po b/po/pt.po new file mode 100644 index 000000000..d3ab2e553 --- /dev/null +++ b/po/pt.po @@ -0,0 +1,1103 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Project-Id-Version: Copay\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Tenda WP \n" +"Language-Team: Paulino Michelazzo \n" +"MIME-Version: 1.0\n" +"X-Generator: Poedit 1.6.10\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: pt\n" + +#: public/views/modals/txp-details.html +msgid "" +"* Only payment proposals created by yourself with no peer actions can be " +"removed" +msgstr "" +"* Apenas propostas de pagamento criadas por você com nenhuma ação de mesmo " +"nível podem ser removidas." + +#: public/views/backup.html +msgid "" +"* You can safely install your backup on another device and use your wallet " +"from multiple devices at the same time." +msgstr "" +"* Você pode instalar com segurança seu backup em outro dispositivo e usar " +"sua carteira a partir de vários dispositivos ao mesmo tempo." + +#: public/views/splash.html +msgid "A multisignature bitcoin wallet" +msgstr "Uma carteira de bitcoin multi-assinada" + +#: public/views/preferences.html +msgid "About Copay" +msgstr "Sobre a Copay" + +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "Aceitar" + +#: public/views/includes/sidebar.html +msgid "Add wallet" +msgstr "Adicionar carteira" + +#: public/views/paymentUri.html public/views/modals/paypro.html +msgid "Address" +msgstr "Endereço" + +#: public/views/preferences.html +msgid "Advanced" +msgstr "Avançado" + +#: public/views/create.html public/views/join.html +msgid "Advanced options" +msgstr "Opções avançadas" + +#: public/views/preferencesAlias.html +msgid "Alias for" +msgstr "Apelido para" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "Já tem uma carteira?" + +#: public/views/preferences.html +msgid "Alternative Currency" +msgstr "Moeda Alternativa" + +#: public/views/paymentUri.html public/views/walletHome.html +#: public/views/modals/txp-details.html +msgid "Amount" +msgstr "Valor" + +#: public/views/walletHome.html +msgid "Amount in" +msgstr "Montante em" + +#: public/views/preferencesLanguage.html +msgid "Applying changes" +msgstr "Aplicar alterações" + +#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +msgid "Are you sure you want to delete this wallet?" +msgstr "Tem certeza que deseja excluir esta carteira?" + +#: public/views/walletHome.html +msgid "Available Balance" +msgstr "Saldo Disponível" + +#: public/views/includes/topbar.html public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Back" +msgstr "Voltar" + +#: public/views/preferences.html +msgid "Backup" +msgstr "Backup" + +#: src/js/controllers/backup.js +msgid "Backup created" +msgstr "Backup criado" + +#: public/views/walletHome.html +msgid "Backup now" +msgstr "Backup agora" + +#: public/views/backup.html +msgid "Backup options" +msgstr "Opções de backup" + +#: public/views/walletHome.html +msgid "" +"Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "" +"Antes de receber fundos, é altamente recomendável que você faça backup de " +"suas chaves de carteira." + +#: public/views/paymentUri.html +msgid "Bitcoin URI is NOT valid!" +msgstr "Bitcoin URI não é válido!" + +#: public/views/walletHome.html +msgid "Bitcoin address" +msgstr "Endereço Bitcoin" + +#: public/views/modals/txp-details.html +msgid "Broadcast Payment" +msgstr "Transmitir Pagamento" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Transmitindo Pagamento" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting transaction" +msgstr "Transmitindo transação" + +#: public/views/unsupported.html +msgid "Browser unsupported" +msgstr "Navegador não suportado" + +#: public/views/modals/txp-details.html +msgid "But not broadcasted. Try to send manually" +msgstr "Mas não transmitido. Tente enviar manualmente" + +#: public/views/includes/password.html +msgid "CANCEL" +msgstr "CANCELAR" + +#: public/views/copayers.html public/views/walletHome.html +msgid "Cancel" +msgstr "Cancelar" + +#: public/views/modals/paypro.html +msgid "Certified by" +msgstr "Certificado por" + +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "" +"Alterando o apelido da carteira somente afeta o nome da carteira local." + +#: src/js/controllers/walletHome.js +msgid "Check you connection and try again" +msgstr "Verifique sua conexão e tente novamente" + +#: public/views/import.html +msgid "Choose a backup file from your computer" +msgstr "Escolha um arquivo de backup do seu computador" + +#: public/views/includes/topbar.html public/views/modals/copayers.html +#: public/views/modals/paypro.html public/views/modals/scanner.html +msgid "Close" +msgstr "Fechar" + +#: public/views/preferences.html +msgid "Color" +msgstr "Cor" + +#: public/views/preferencesAbout.html +msgid "Commit hash" +msgstr "Commit de hash" + +#: public/views/modals/tx-details.html +msgid "Confirmations" +msgstr "Confirmações" + +#: public/views/modals/copayers.html +msgid "Copayers" +msgstr "Copayers" + +#: public/views/backup.html +msgid "Copy backup to a safe place" +msgstr "Copie o backup para um lugar seguro" + +#: public/views/backup.html +msgid "Copy this text as it is to a safe place (notepad or email)" +msgstr "" +"Copie este texto como está para um lugar seguro (bloco de notas ou e-mail)" + +#: public/views/backup.html +msgid "Copy to clipboard" +msgstr "Copiar para área de transferência" + +#: src/js/controllers/walletHome.js +msgid "Could not accept payment. Check you connection and try again" +msgstr "" +"Não foi possível aceitar pagamentos. Verifique sua conexão e tente novamente" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment. Check you connection and try again" +msgstr "" +"Não foi possível transmitir pagamentos. Verifique sua conexão e tente " +"novamente" + +#: src/js/controllers/walletHome.js +msgid "" +"Could not connect wallet service. Check your Internet connexion and your " +"wallet service configuration." +msgstr "" +"Não foi possível se conectar com o serviço de carteira. Verifique sua " +"conexão e as configurações de seu serviço de carteiras." + +#: src/js/controllers/walletHome.js +msgid "Could not create address. Check you connection and try again" +msgstr "" +"Não foi possível criar o endereço. Verifique sua conexão e tente novamente" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "Não foi possível criar proposta de pagamento" + +#: src/js/services/profileService.js +msgid "Could not create using the specified extended private key" +msgstr "Não foi possível criar usando a chave privada estendida especificada" + +#: src/js/controllers/import.js +msgid "Could not decrypt file, check your password" +msgstr "Não foi possível descriptografar o arquivo, verifique sua senha" + +#: src/js/controllers/walletHome.js +msgid "Could not delete payment proposal. Check you connection and try again" +msgstr "" +"Não foi possível apagar a proposta de pagamento. Verifique sua conexão e " +"tente novamente" + +#: src/js/controllers/walletHome.js +msgid "Could not fetch payment information" +msgstr "Não foi possível obter a informação do pagamento" + +#: public/views/walletHome.html +msgid "Could not fetch transaction history" +msgstr "Não foi possível obter o histórico de transação" + +#: src/js/services/profileService.js +msgid "Could not import. Check input file and password" +msgstr "Não foi possível importar. Verifique o arquivo de entrada e senha" + +#: src/js/services/profileService.js +msgid "Could not join using the specified extended private key" +msgstr "" +"Não é possível asssociar-se usando a chave privada estendida especificada" + +#: src/js/controllers/join.js +msgid "Could not join wallet:" +msgstr "Não é possível se associar a carteira:" + +#: src/js/controllers/walletHome.js +msgid "Could not reject payment. Check you connection and try again" +msgstr "" +"Não é possível rejeitar o pagamentos. Verifique sua conexão e tente novamente" + +#: src/js/controllers/walletHome.js +msgid "Could not send payment" +msgstr "Não foi possível enviar o pagamento" + +#: public/views/walletHome.html +msgid "Could not update Wallet" +msgstr "Não é possível atualizar carteira" + +#: public/views/create.html public/views/walletHome.html +msgid "Create" +msgstr "Criar" + +#: public/views/add.html +msgid "Create new wallet" +msgstr "Criando nova carteira" + +#: public/views/includes/sidebar.html +msgid "Create, join or import" +msgstr "Criar, participar ou importar" + +#: public/views/modals/txp-details.html +msgid "Created by" +msgstr "Criado por" + +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Criando Perfil…" + +#: public/views/create.html +msgid "Creating Wallet..." +msgstr "Criando Carteira…" + +#: src/js/controllers/walletHome.js +msgid "Creating transaction" +msgstr "Criando transação" + +#: public/views/modals/tx-details.html +msgid "Date" +msgstr "Data" + +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Excluir Proposta de Pagamento" + +#: public/views/preferencesAdvanced.html +msgid "Delete Wallet" +msgstr "Excluir Carteira" + +#: public/views/copayers.html +msgid "Delete it and create a new one" +msgstr "Apagar e criar um novo" + +#: public/views/preferencesDeleteWallet.html +msgid "Delete wallet" +msgstr "Excluir carteira" + +#: src/js/controllers/walletHome.js +msgid "Deleting payment" +msgstr "Excluindo pagamento" + +#: public/views/modals/paypro.html public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "Detalhes" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Desabilitado" + +#: public/views/backup.html +msgid "Download backup" +msgstr "Baixar backup" + +#: public/views/includes/password.html +msgid "ENTER" +msgstr "ENTER" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Notificações por E-mail" + +#: public/views/preferences.html +msgid "Encrypt Private Key" +msgstr "Criptografar Chave Privada" + +#: src/js/controllers/backup.js +msgid "Encrypted backup file saved" +msgstr "Arquivo de backup criptografado salvo" + +#: src/js/controllers/index.js +msgid "English" +msgstr "Inglês" + +#: public/views/includes/password.html +msgid "Enter your password" +msgstr "Digite sua senha" + +#: src/js/services/profileService.js +msgid "Error creating wallet" +msgstr "Erro na criação da carteira" + +#: src/js/services/profileService.js +msgid "Error creating wallet. Check your internet connection" +msgstr "Erro criando carteira. Verifique sua conexão com a internet" + +#: src/js/services/profileService.js +msgid "Error importing wallet:" +msgstr "Erro importando carteira:" + +#: public/views/modals/paypro.html public/views/modals/txp-details.html +msgid "Expires" +msgstr "Expira" + +#: src/js/controllers/importLegacy.js +msgid "Failed to import wallets" +msgstr "Falha ao importar carteiras" + +#: public/views/create.html +msgid "Family vacation funds" +msgstr "Fundos de férias com a família" + +#. Get information of payment if using Payment Protocol +#: src/js/controllers/walletHome.js +msgid "Fetching Payment Information" +msgstr "Buscando Informação de Pagamento" + +#: src/js/controllers/index.js +msgid "French" +msgstr "Francês" + +#: src/js/services/notificationsService.js +msgid "Funds received" +msgstr "Fundos recebidos" + +#: public/views/splash.html +msgid "GET STARTED" +msgstr "COMEÇAR" + +#: public/views/walletHome.html +msgid "Generate new address" +msgstr "Gerar novo endereço" + +#: public/views/preferences.html +msgid "Global settings" +msgstr "Configurações globais" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Tem um Backup do Copay v 0.9?" + +#: public/views/create.html public/views/join.html +msgid "Hide" +msgstr "Ocultar" + +#: src/js/controllers/index.js +msgid "History" +msgstr "História" + +#: src/js/controllers/index.js +msgid "Home" +msgstr "Início" + +#: public/views/create.html +msgid "If not given, a random key will be generated" +msgstr "Se não informada, uma chave randômica será gerada" + +#: public/views/join.html +msgid "If not given, a secure key will be generated" +msgstr "Se não informada, uma chave de segurança será gerada" + +#: public/views/importLegacy.html +msgid "Import" +msgstr "Importar" + +#: public/views/import.html public/views/splash.html +msgid "Import backup" +msgstr "Importar backup" + +#: public/views/importLegacy.html +msgid "Import from the Cloud?" +msgstr "Importar da nuvem?" + +#: public/views/import.html +msgid "Import here" +msgstr "Importar aqui" + +#: public/views/add.html +msgid "Import wallet" +msgstr "Importar carteira" + +#: public/views/import.html +msgid "Importing wallet..." +msgstr "Importando carteira…" + +#: public/views/importLegacy.html +msgid "Importing..." +msgstr "Importando…" + +#: src/js/controllers/index.js +msgid "Japanese" +msgstr "Japonês" + +#: public/views/create.html public/views/join.html +msgid "John" +msgstr "John" + +#: public/views/join.html +msgid "Join" +msgstr "Participar" + +#: public/views/add.html +msgid "Join shared wallet" +msgstr "Associando carteira compartilhada" + +#: public/views/join.html +msgid "Joining Wallet..." +msgstr "Associando-se a Carteira…" + +#: public/views/preferences.html +msgid "Language" +msgstr "Idioma" + +#: public/views/importLegacy.html +msgid "Learn more about Wallet Migration" +msgstr "Saiba mais sobre Migração de Carteira" + +#: public/views/paymentUri.html +msgid "Make a payment to" +msgstr "Fazer um pagamento para" + +#: public/views/create.html +msgid "Master extended private key" +msgstr "Principal chave privada estendida" + +#: public/views/includes/copayers.html public/views/modals/copayers.html +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "Me" +msgstr "Eu" + +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "Nota" + +#: public/views/modals/tx-details.html +msgid "Merchant message" +msgstr "Mensagem do Comerciante" + +#: public/views/paymentUri.html +msgid "Message" +msgstr "Mensagem" + +#: public/views/walletHome.html +msgid "More" +msgstr "Mais" + +#: public/views/walletHome.html +msgid "Moved" +msgstr "Movido" + +#: public/views/walletHome.html +msgid "Multisignature wallet" +msgstr "Carteira multi-assinada" + +#: public/views/walletHome.html +msgid "My Bitcoin address" +msgstr "Meu endereço Bitcoin" + +#: public/views/paymentUri.html +msgid "Network" +msgstr "Rede" + +#: src/js/services/notificationsService.js +msgid "New Payment Proposal" +msgstr "Nova Proposta de Pagamento" + +#: public/views/modals/confirmation.html +msgid "No" +msgstr "Não" + +#: public/views/walletHome.html +msgid "No transactions yet" +msgstr "Nenhuma transação ainda" + +#: public/views/walletHome.html +msgid "Not valid" +msgstr "Inválido" + +#: public/views/walletHome.html public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Note" +msgstr "Nota" + +#: public/views/modals/tx-status.html +msgid "OKAY" +msgstr "OKAY" + +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "Participants" +msgstr "Participantes" + +#: public/views/import.html public/views/importLegacy.html +msgid "Password" +msgstr "Senha" + +#: public/views/includes/password.html +msgid "Password cannot be recovered. Be sure to write it down" +msgstr "Senha não pode ser recuperada. Tenha certeza de anotá-la" + +#: src/js/services/profileService.js +msgid "Password needed" +msgstr "Senha necessária" + +#: src/js/controllers/password.js +msgid "Passwords do not match" +msgstr "As senhas não coincidem" + +#: public/views/join.html +msgid "Paste invitation here" +msgstr "Cole o convite aqui" + +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Cole o texto puro do backup aqui" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Pagar Para" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "Pagamento Aceito" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Proposta de Pagamento" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Proposta de Pagamento Criada" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Proposta de Pagamento Rejeitada" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Proposta de Pagamento Rejeitada pelo Copayer" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Proposta de Pagamento Assinada pelo Copayer" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Propostas de Pagamento" + +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "Protocolo de pagamento não suportado no Chrome App" + +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "Pagamento Rejeitado" + +#: public/views/modals/tx-status.html src/js/services/notificationsService.js +msgid "Payment Sent" +msgstr "Pagamento Enviado" + +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "Pagamento aceito…" + +#: public/views/modals/txp-details.html +msgid "Payment details" +msgstr "Detalhes do pagamento" + +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "Pagamento finalmente rejeitado" + +#: public/views/modals/paypro.html +msgid "Payment request" +msgstr "Pedido de pagamento" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "Pagamento enviado!" + +#: public/views/walletHome.html +msgid "Payment to" +msgstr "Pagamento para" + +#: public/views/preferencesDeleteWallet.html +msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED" +msgstr "" +"Excluir permanentemente esta carteira. ESTA AÇÃO NÃO PODE SER REVERTIDA" + +#: public/views/create.html +msgid "Personal Wallet" +msgstr "Carteira Pessoal" + +#: src/js/controllers/create.js src/js/controllers/join.js +msgid "Please enter the required fields" +msgstr "Por favor, preencha os campos obrigatórios" + +#: src/js/controllers/import.js +msgid "Please, select your backup file" +msgstr "Por favor, selecione seu arquivo de backup" + +#: public/views/walletHome.html +msgid "Preferences" +msgstr "Preferências" + +#: src/js/controllers/index.js +msgid "Receive" +msgstr "Receber" + +#: public/views/walletHome.html +msgid "Received" +msgstr "Recebido" + +#: public/views/walletHome.html +msgid "Reconnecting to Wallet Service..." +msgstr "Reconectando ao Serviço de Carteira…" + +#: public/views/walletHome.html +msgid "Recreate" +msgstr "Recriado" + +#: public/views/walletHome.html +msgid "Recreating Wallet..." +msgstr "Recriando Carteira…" + +#: public/views/modals/txp-details.html +msgid "Reject" +msgstr "Rejeitar" + +#: src/js/controllers/walletHome.js +msgid "Rejecting payment" +msgstr "Rejeitando pagamento" + +#: public/views/preferencesAbout.html +msgid "Release Information" +msgstr "Liberar Informação" + +#: public/views/backup.html public/views/includes/password.html +msgid "Repeat password" +msgstr "Repetir Senha" + +#: public/views/import.html public/views/join.html +msgid "Required" +msgstr "Obrigatório" + +#: public/views/splash.html +msgid "Retrying..." +msgstr "Repetindo…" + +#: public/views/includes/password.html +msgid "SET" +msgstr "DEFINIR" + +#: public/views/walletHome.html +msgid "SKIP BACKUP" +msgstr "PULAR BACKUP" + +#: public/views/preferencesAlias.html public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html +msgid "Save" +msgstr "Salvar" + +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Salvando preferências…" + +#: src/js/services/notificationsService.js +msgid "Scan Finished" +msgstr "Pesquisa Finalizada" + +#: public/views/preferencesAdvanced.html +msgid "Scan addresses for funds" +msgstr "Pesquisando endereços por fundos" + +#: public/views/walletHome.html +msgid "Scan status finished with error" +msgstr "Pesquisa de status finalizada com erro" + +#: public/views/walletHome.html +msgid "Scanning Wallet funds..." +msgstr "Pesquisando fundos de carteira…" + +#: public/views/modals/tx-details.html +msgid "See it on the blockchain" +msgstr "Veja no blockchain" + +#: public/views/import.html +msgid "Select a backup file" +msgstr "Selecione um arquivo de backup" + +#: public/views/paymentUri.html +msgid "Select a wallet" +msgstr "Selecione uma carteira" + +#: public/views/create.html +msgid "Select required number of signatures" +msgstr "Selecione o número de assinaturas necessárias" + +#: public/views/create.html +msgid "Select total number of copayers" +msgstr "Selecione o número total de copayers" + +#: public/views/walletHome.html public/views/includes/transaction.html +#: src/js/controllers/index.js +msgid "Send" +msgstr "Enviar" + +#: public/views/backup.html public/views/preferencesLogs.html +msgid "Send by email" +msgstr "Enviar por E-mail" + +#: public/views/walletHome.html +msgid "Sent" +msgstr "Enviado" + +#: public/views/importLegacy.html +msgid "Server" +msgstr "Servidor" + +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "Log da sessão" + +#: public/views/backup.html +msgid "Set up a Password for your backup" +msgstr "Configure uma senha para seu backup" + +#: public/views/includes/password.html +msgid "Set up a password" +msgstr "Configure uma senha" + +#: public/views/preferencesEmail.html +msgid "" +"Setting up email notifications could weaken your privacy, if the wallet " +"service provider is compromised. Information available to an attacker would " +"include your wallet addresses and its balance, but no more." +msgstr "" +"Configurar notificações de e-mail pode enfraquecer sua privacidade se o " +"prestador de serviços de carteira está comprometido. As informações " +"disponíveis para um invasor podem incluir seus endereços carteira e seu " +"saldo, nada mais." + +#: public/views/walletHome.html +msgid "Share address" +msgstr "Compartilhar endereço" + +#: public/views/copayers.html +msgid "Share invitation" +msgstr "Compartilhar convite" + +#: public/views/copayers.html +msgid "Share this invitation with your copayers" +msgstr "Compartilhe este convite com seus copayers" + +#: public/views/walletHome.html +msgid "" +"Share this wallet address to receive payments. To protect your privacy, new " +"addresses are generated automatically once you use them." +msgstr "" +"Compartilhe este endereço da carteira para receber pagamentos. Para proteger " +"sua privacidade, novos endereços são gerados automaticamente cada vez que " +"você usá-los." + +#: public/views/create.html +msgid "Shared Wallet" +msgstr "Compartilhar Carteira" + +#: public/views/create.html public/views/join.html +msgid "Show" +msgstr "Mostrar" + +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Pagamento assinado" + +#: src/js/controllers/walletHome.js +msgid "Signing transaction" +msgstr "Transação assinada" + +#: src/js/controllers/index.js +msgid "Spanish" +msgstr "Espanhol" + +#: src/js/controllers/copayers.js src/js/controllers/import.js +#: src/js/controllers/preferencesDelete.js +msgid "Success" +msgstr "Sucesso" + +#: public/views/walletHome.html +msgid "Tap to retry" +msgstr "Bata para repetir" + +#: src/js/controllers/walletHome.js +msgid "" +"The payment was created but could not be completed. Please try again from " +"home screen" +msgstr "" +"O pagamento foi criado mas não pode ser completado. Por favor, tente " +"novamente a partir da tela inicial." + +#: src/js/controllers/walletHome.js +msgid "" +"The payment was created but could not be signed. Please try again from home " +"screen." +msgstr "" +"O pagamento foi criado mas não pode ser assinado. Por favor, tente novamente " +"a partir da tela inicial." + +#: public/views/modals/txp-details.html +msgid "The payment was removed by creator" +msgstr "O pagamento foi removido pelo criador" + +#: src/js/controllers/walletHome.js +msgid "" +"The payment was signed but could not be broadcasted. Please try again from " +"home screen." +msgstr "" +"O pagamento foi assinado mas não pode ser transmitido. Por favor, tente " +"novamente a partir da tela inicial." + +#: 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." +msgstr "" +"A chave privada para esta carteira é criptografada. A exportação de um " +"backup manterá a chave privada criptografada no arquivo de backup." + +#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +msgid "The wallet \"{{walletName}}\" was deleted" +msgstr "A carteira “{{walletName}}” foi removida" + +#: src/js/controllers/import.js +msgid "There is an error in the form" +msgstr "Existe um erro no formulário" + +#: public/views/walletHome.html +msgid "" +"This wallet is not registered at the given Bitcore Wallet Service (BWS). You " +"can recreate it from the local information." +msgstr "" +"Esta carteira não está registrada no dado serviço Wallet Service Bitcore " +"(BWS) informado. Você pode recriá-la a partir da informação local." + +#: public/views/modals/txp-details.html +msgid "Time" +msgstr "Hora" + +#: public/views/walletHome.html public/views/includes/transaction.html +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "To" +msgstr "Para" + +#: public/views/walletHome.html +msgid "Total Locked Balance" +msgstr "Saldo Total Bloqueado" + +#: public/views/modals/tx-details.html +msgid "Transaction" +msgstr "Transação" + +#: src/js/controllers/walletHome.js +msgid "Unable to send transaction proposal" +msgstr "Impossível enviar a proposta de transação" + +#: public/views/walletHome.html public/views/modals/tx-details.html +msgid "Unconfirmed" +msgstr "Não confirmado" + +#: public/views/preferences.html +msgid "Unit" +msgstr "Unidade" + +#: public/views/walletHome.html +msgid "Unsent transactions" +msgstr "Transações não enviadas" + +#: public/views/modals/paypro.html +msgid "Untrusted" +msgstr "Não confiável" + +#: public/views/walletHome.html +msgid "Updating Wallet..." +msgstr "Atualizando Carteira…" + +#: public/views/preferencesAbout.html +msgid "Version" +msgstr "Versão" + +#: public/views/backup.html +msgid "View backup" +msgstr "Ver backup" + +#: public/views/walletHome.html +msgid "WARNING: Backup needed" +msgstr "Atenção: Backup necessário" + +#: public/views/walletHome.html +msgid "WARNING: Wallet not registered" +msgstr "Atenção: Carteira não registrada" + +#: public/views/splash.html +msgid "WELCOME TO COPAY" +msgstr "BEM-VINDO A COPAY" + +#: public/views/copayers.html +msgid "Waiting for copayers" +msgstr "Aguardando copayers" + +#: public/views/copayers.html +msgid "Waiting..." +msgstr "Aguardando…" + +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Apelido da Carteira" + +#: src/js/services/profileService.js +msgid "Wallet Already Imported:" +msgstr "Carteira já importada:" + +#: public/views/join.html +msgid "Wallet Invitation" +msgstr "Convite para Carteira" + +#: public/views/join.html +msgid "Wallet Invitation is not valid!" +msgstr "O convite para carteira não é válido!" + +#: src/js/services/profileService.js +msgid "Wallet already exists" +msgstr "A carteira já existe" + +#: public/views/copayers.html +msgid "Wallet incomplete and broken" +msgstr "Carteira incompleta e quebrada" + +#: public/views/create.html +msgid "Wallet name" +msgstr "Nome da carteira" + +#: src/js/controllers/walletHome.js +msgid "" +"Wallet service timed out. Check your Internet connexion and your wallet " +"service configuration." +msgstr "" +"Serviço de carteira expirou. Verifique sua conexão à Internet e sua " +"configuração do serviço de carteira." + +#: public/views/preferencesDeleteWallet.html +msgid "Warning!" +msgstr "Atenção!" + +#: src/js/services/profileService.js +msgid "Wrong password" +msgstr "Senha errada" + +#: public/views/modals/confirmation.html +msgid "Yes" +msgstr "Sim" + +#: public/views/walletHome.html +msgid "You do not have a wallet" +msgstr "Você não tem uma carteira" + +#: public/views/backup.html public/views/import.html +msgid "Your backup password" +msgstr "Sua senha de backup" + +#: public/views/create.html public/views/join.html +msgid "Your nickname" +msgstr "Seu apelido" + +#: public/views/includes/password.html +msgid "Your password" +msgstr "Sua senha" + +#: public/views/importLegacy.html +msgid "Your profile password" +msgstr "Sua senha de perfil" + +#: src/js/controllers/import.js +msgid "Your wallet has been imported correctly" +msgstr "Sua carteira foi importada corretamente" + +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "e-mail para notificações de carteira" + +#: public/views/walletHome.html +msgid "locked by pending payments" +msgstr "bloqueado por pagamentos pendentes" + +#: public/views/copayers.html public/views/create.html +#: public/views/walletHome.html public/views/includes/sidebar.html +msgid "of" +msgstr "de" + +#: public/views/walletHome.html +msgid "optional" +msgstr "opcional" + +#: public/views/preferences.html +msgid "settings" +msgstr "configurações" + +#: public/views/walletHome.html +msgid "too long!" +msgstr "muito tempo!" + +#: public/views/create.html +msgid "wallet" +msgstr "carteira" + +#: src/js/controllers/importLegacy.js +msgid "" +"{{len}} wallets imported. Funds scanning in progress. Hold on to see updated " +"balance" +msgstr "" +"{{len}} carteiras importadas. Recursos de digitalização em andamento. Espere " +"para ver o saldo atualizado" diff --git a/po/template.pot b/po/template.pot index 1b6caacc6..4dbda9a80 100644 --- a/po/template.pot +++ b/po/template.pot @@ -5,30 +5,31 @@ msgstr "" "Project-Id-Version: \n" #: public/views/modals/txp-details.html -msgid "* Only transactions created by yourself with no peer signatures can be removed" +msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." msgstr "" #: public/views/backup.html -msgid "* You can safely install your backup on other device and use your wallet from many devices at the same time." +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." msgstr "" -#: public/views/splash/1.html +#: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "" -#: src/js/services/notificationsService.js -msgid "A transaction was finally rejected" -msgstr "" - #: public/views/preferences.html msgid "About Copay" msgstr "" +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "" + #: public/views/includes/sidebar.html msgid "Add wallet" msgstr "" #: public/views/paymentUri.html +#: public/views/modals/customized-amount.html #: public/views/modals/paypro.html msgid "Address" msgstr "" @@ -37,17 +38,31 @@ msgstr "" msgid "Advanced" msgstr "" +#: public/views/disclaimer.html +msgid "Agree" +msgstr "" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "" + #: public/views/preferences.html msgid "Alternative Currency" msgstr "" #: public/views/paymentUri.html #: public/views/walletHome.html +#: public/views/modals/customized-amount.html #: public/views/modals/txp-details.html msgid "Amount" msgstr "" #: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Amount in" msgstr "" @@ -64,6 +79,11 @@ msgstr "" msgid "Available Balance" msgstr "" +#: public/views/create.html +#: public/views/join.html +msgid "BIP32 master extended private key" +msgstr "" + #: public/views/includes/topbar.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html @@ -90,6 +110,10 @@ msgstr "" msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "" +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "" + #: public/views/paymentUri.html msgid "Bitcoin URI is NOT valid!" msgstr "" @@ -98,8 +122,16 @@ msgstr "" msgid "Bitcoin address" msgstr "" +#: public/views/preferencesFee.html +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgstr "" + #: public/views/modals/txp-details.html -msgid "Broadcast Transaction" +msgid "Broadcast Payment" +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" msgstr "" #: src/js/controllers/walletHome.js @@ -127,14 +159,28 @@ msgstr "" msgid "Certified by" msgstr "" +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Check you connection and try again" +msgstr "" + #: public/views/import.html -msgid "Choose backup file from your computer" +msgid "Choose a backup file from your computer" +msgstr "" + +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" msgstr "" #: public/views/includes/topbar.html #: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html #: public/views/modals/paypro.html #: public/views/modals/scanner.html +#: public/views/modals/wallets.html msgid "Close" msgstr "" @@ -155,11 +201,11 @@ msgid "Copayers" msgstr "" #: public/views/backup.html -msgid "Copy backup in a safe place" +msgid "Copy backup to a safe place" msgstr "" #: public/views/backup.html -msgid "Copy this text as it is in a safe place (notepad or email)" +msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "" #: public/views/backup.html @@ -167,13 +213,25 @@ msgid "Copy to clipboard" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not broadcast transaction. Please try again." +msgid "Could not accept payment. Check you connection and try again" +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment. Check you connection and try again" msgstr "" #: src/js/controllers/walletHome.js msgid "Could not connect wallet service. Check your Internet connexion and your wallet service configuration." msgstr "" +#: src/js/controllers/walletHome.js +msgid "Could not create address. Check you connection and try again" +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "" + #: src/js/services/profileService.js msgid "Could not create using the specified extended private key" msgstr "" @@ -183,7 +241,7 @@ msgid "Could not decrypt file, check your password" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not delete transaction. Please try again." +msgid "Could not delete payment proposal. Check you connection and try again" msgstr "" #: src/js/controllers/walletHome.js @@ -207,30 +265,30 @@ msgid "Could not join wallet:" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not reject transaction. Please try again." +msgid "Could not reject payment. Check you connection and try again" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not send transaction. Please try again." -msgstr "" - -#: src/js/controllers/walletHome.js -msgid "Could not sign transaction. Please try again." +msgid "Could not send payment" msgstr "" #: public/views/walletHome.html msgid "Could not update Wallet" msgstr "" -#: public/views/create.html #: public/views/walletHome.html msgid "Create" msgstr "" #: public/views/add.html +#: public/views/create.html msgid "Create new wallet" msgstr "" +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "" + #: public/views/includes/sidebar.html msgid "Create, join or import" msgstr "" @@ -239,8 +297,11 @@ msgstr "" msgid "Created by" msgstr "" +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "" + #: public/views/create.html -#: public/views/splash/1.html msgid "Creating Wallet..." msgstr "" @@ -252,6 +313,10 @@ msgstr "" msgid "Date" msgstr "" +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "" + #: public/views/preferencesAdvanced.html msgid "Delete Wallet" msgstr "" @@ -265,7 +330,22 @@ msgid "Delete wallet" msgstr "" #: src/js/controllers/walletHome.js -msgid "Deleting transaction" +msgid "Deleting payment" +msgstr "" + +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "" + +#: src/js/controllers/index.js +msgid "Deutsch" +msgstr "" + +#: public/views/preferences.html +msgid "Disabled" msgstr "" #: public/views/backup.html @@ -276,6 +356,18 @@ msgstr "" msgid "ENTER" msgstr "" +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "" + +#: src/js/controllers/preferencesFee.js +msgid "Emergency" +msgstr "" + #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "" @@ -317,6 +409,10 @@ msgstr "" msgid "Family vacation funds" msgstr "" +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" @@ -330,21 +426,37 @@ msgstr "" msgid "Funds received" msgstr "" -#: public/views/splash/1.html +#: public/views/splash.html msgid "GET STARTED" msgstr "" +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "" + #: public/views/walletHome.html msgid "Generate new address" msgstr "" +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "" + #: public/views/preferences.html msgid "Global settings" msgstr "" +#: public/views/disclaimer.html +msgid "Go back" +msgstr "" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "" + #: public/views/create.html #: public/views/join.html -msgid "Hide" +msgid "Hide Advanced options" msgstr "" #: src/js/controllers/index.js @@ -355,10 +467,11 @@ msgstr "" msgid "Home" msgstr "" -#: public/views/create.html -msgid "If not given, a random key will be generated" +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." msgstr "" +#: public/views/create.html #: public/views/join.html msgid "If not given, a secure key will be generated" msgstr "" @@ -368,17 +481,18 @@ msgid "Import" msgstr "" #: public/views/import.html +#: public/views/splash.html msgid "Import backup" msgstr "" -#: public/views/add.html -msgid "Import from Copay Beta 0.9" -msgstr "" - #: public/views/importLegacy.html msgid "Import from the Cloud?" msgstr "" +#: public/views/import.html +msgid "Import here" +msgstr "" + #: public/views/add.html msgid "Import wallet" msgstr "" @@ -391,11 +505,6 @@ msgstr "" msgid "Importing..." msgstr "" -#: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html -msgid "Information" -msgstr "" - #: src/js/controllers/index.js msgid "Japanese" msgstr "" @@ -430,6 +539,7 @@ msgid "Make a payment to" msgstr "" #: public/views/create.html +#: public/views/join.html msgid "Master extended private key" msgstr "" @@ -441,6 +551,9 @@ msgid "Me" msgstr "" #: public/views/modals/paypro.html +msgid "Memo" +msgstr "" + #: public/views/modals/tx-details.html msgid "Merchant message" msgstr "" @@ -470,7 +583,7 @@ msgid "Network" msgstr "" #: src/js/services/notificationsService.js -msgid "New Transaction" +msgid "New Payment Proposal" msgstr "" #: public/views/modals/confirmation.html @@ -481,7 +594,12 @@ msgstr "" msgid "No transactions yet" msgstr "" +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "" + #: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Not valid" msgstr "" @@ -495,6 +613,11 @@ msgstr "" msgid "OKAY" msgstr "" +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Participants" +msgstr "" + #: public/views/import.html #: public/views/importLegacy.html msgid "Password" @@ -512,28 +635,77 @@ msgstr "" msgid "Passwords do not match" msgstr "" -#: public/views/import.html -msgid "Paste backup plain text code" -msgstr "" - #: public/views/join.html msgid "Paste invitation here" msgstr "" +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "" + #: src/js/controllers/walletHome.js msgid "Payment Protocol not supported on Chrome App" msgstr "" #: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "" + +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js msgid "Payment Sent" msgstr "" +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "" + #: public/views/modals/txp-details.html msgid "Payment details" msgstr "" +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "" + #: public/views/modals/paypro.html -msgid "Payment protocol request" +msgid "Payment request" +msgstr "" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" msgstr "" #: public/views/walletHome.html @@ -541,10 +713,10 @@ msgid "Payment to" msgstr "" #: public/views/preferencesDeleteWallet.html -msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED" +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "" -#: public/views/walletHome.html +#: public/views/create.html msgid "Personal Wallet" msgstr "" @@ -557,10 +729,26 @@ msgstr "" msgid "Please, select your backup file" msgstr "" +#: src/js/controllers/index.js +msgid "Portuguese" +msgstr "" + #: public/views/walletHome.html msgid "Preferences" msgstr "" +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "" + #: src/js/controllers/index.js msgid "Receive" msgstr "" @@ -586,28 +774,29 @@ msgid "Reject" msgstr "" #: src/js/controllers/walletHome.js -msgid "Rejecting transaction" +msgid "Rejecting payment" msgstr "" #: public/views/preferencesAbout.html msgid "Release Information" msgstr "" -#: public/views/modals/txp-details.html -msgid "Remove transaction" -msgstr "" - #: public/views/backup.html #: public/views/includes/password.html msgid "Repeat password" msgstr "" +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "" + #: public/views/import.html #: public/views/join.html msgid "Required" msgstr "" -#: public/views/splash/1.html +#: public/views/splash.html msgid "Retrying..." msgstr "" @@ -619,10 +808,16 @@ msgstr "" msgid "SKIP BACKUP" msgstr "" +#: public/views/preferencesAlias.html #: public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html msgid "Save" msgstr "" +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "" + #: src/js/services/notificationsService.js msgid "Scan Finished" msgstr "" @@ -652,7 +847,7 @@ msgid "Select a wallet" msgstr "" #: public/views/create.html -msgid "Select required signatures" +msgid "Select required number of signatures" msgstr "" #: public/views/create.html @@ -665,6 +860,10 @@ msgstr "" msgid "Send" msgstr "" +#: public/views/walletHome.html +msgid "Send All" +msgstr "" + #: public/views/backup.html #: public/views/preferencesLogs.html msgid "Send by email" @@ -690,6 +889,10 @@ msgstr "" msgid "Set up a password" msgstr "" +#: public/views/preferencesEmail.html +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "" + #: public/views/walletHome.html msgid "Share address" msgstr "" @@ -703,21 +906,20 @@ msgid "Share this invitation with your copayers" msgstr "" #: 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." +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "" + +#: public/views/create.html +msgid "Shared Wallet" msgstr "" #: public/views/create.html #: public/views/join.html -msgid "Show" +msgid "Show Advanced options" msgstr "" -#: public/views/modals/txp-details.html -msgid "Sign" -msgstr "" - -#: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html -msgid "Signatures" +#: src/js/controllers/walletHome.js +msgid "Signing payment" msgstr "" #: src/js/controllers/walletHome.js @@ -728,10 +930,6 @@ msgstr "" msgid "Spanish" msgstr "" -#: public/views/walletHome.html -msgid "Spend proposals" -msgstr "" - #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -742,8 +940,37 @@ msgstr "" msgid "Tap to retry" msgstr "" +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "" + +#: public/views/create.html +msgid "Testnet" +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 -msgid "The transaction was removed by creator" +msgid "The payment was removed by creator" +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 +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "" + +#: public/views/disclaimer.html +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." msgstr "" #: src/js/controllers/copayers.js @@ -751,12 +978,12 @@ msgstr "" msgid "The wallet \"{{walletName}}\" was deleted" msgstr "" -#: src/js/controllers/import.js -msgid "There is an error in the form" +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" msgstr "" -#: public/views/backup.html -msgid "This wallet have its private key encrypted. Exporting a backup will keep the private key encrypted on the backup." +#: src/js/controllers/import.js +msgid "There is an error in the form" msgstr "" #: public/views/walletHome.html @@ -769,7 +996,6 @@ msgstr "" #: 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" @@ -783,54 +1009,6 @@ msgstr "" msgid "Transaction" msgstr "" -#: src/js/services/notificationsService.js -msgid "Transaction Rejected" -msgstr "" - -#: src/js/services/notificationsService.js -msgid "Transaction Sent" -msgstr "" - -#: src/js/services/notificationsService.js -msgid "Transaction Signed" -msgstr "" - -#: public/views/modals/txp-details.html -msgid "Transaction accepted..." -msgstr "" - -#: src/js/services/txStatus.js -msgid "Transaction broadcasted" -msgstr "" - -#: public/views/modals/txp-details.html -msgid "Transaction finally rejected" -msgstr "" - -#: src/js/controllers/walletHome.js -msgid "Transaction not broadcasted. Please try again." -msgstr "" - -#: public/views/modals/txp-details.html -msgid "Transaction proposal" -msgstr "" - -#: src/js/services/txStatus.js -msgid "Transaction proposal created" -msgstr "" - -#: src/js/services/txStatus.js -msgid "Transaction proposal signed" -msgstr "" - -#: public/views/modals/txp-details.html -msgid "Transaction sent!" -msgstr "" - -#: src/js/services/txStatus.js -msgid "Transaction was rejected" -msgstr "" - #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "" @@ -856,10 +1034,6 @@ msgstr "" msgid "Updating Wallet..." msgstr "" -#: public/views/create.html -msgid "Use test network" -msgstr "" - #: public/views/preferencesAbout.html msgid "Version" msgstr "" @@ -876,7 +1050,7 @@ msgstr "" msgid "WARNING: Wallet not registered" msgstr "" -#: public/views/splash/1.html +#: public/views/splash.html msgid "WELCOME TO COPAY" msgstr "" @@ -888,6 +1062,10 @@ msgstr "" msgid "Waiting..." msgstr "" +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "" + #: src/js/services/profileService.js msgid "Wallet Already Imported:" msgstr "" @@ -929,7 +1107,7 @@ msgid "Yes" msgstr "" #: public/views/walletHome.html -msgid "You do not have any wallet" +msgid "You do not have a wallet" msgstr "" #: public/views/backup.html @@ -954,17 +1132,15 @@ msgstr "" msgid "Your wallet has been imported correctly" msgstr "" -#: public/views/create.html -#: public/views/join.html -msgid "advanced options" +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" msgstr "" #: public/views/walletHome.html -msgid "in pending transactions" +msgid "locked by pending payments" msgstr "" #: public/views/copayers.html -#: public/views/create.html #: public/views/walletHome.html #: public/views/includes/sidebar.html msgid "of" @@ -974,16 +1150,20 @@ msgstr "" msgid "optional" msgstr "" +#: public/views/preferences.html +msgid "settings" +msgstr "" + #: public/views/walletHome.html msgid "too long!" msgstr "" -#: public/views/create.html -msgid "wallet" +#: public/views/preferencesFee.html +msgid "{{fee.value}} bits per kB" msgstr "" -#: public/views/preferences.html -msgid "{{index.walletName}} settings" +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "" #: src/js/controllers/importLegacy.js diff --git a/public/img/icons/icon.icns b/public/img/icons/icon.icns new file mode 100644 index 000000000..8fc084681 Binary files /dev/null and b/public/img/icons/icon.icns differ diff --git a/public/img/icons/icon.ico b/public/img/icons/icon.ico new file mode 100644 index 000000000..e40c22dcf Binary files /dev/null and b/public/img/icons/icon.ico differ diff --git a/public/index.html b/public/index.html index f00b0d837..88cbd56cb 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,7 @@ - + diff --git a/public/views/add.html b/public/views/add.html index d42824a7b..669868385 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -1,7 +1,7 @@
+ ng-init="titleSection='Add wallet'; closeToHome = true; noColor = true">
diff --git a/public/views/backup.html b/public/views/backup.html index a7f0ba358..f28f43656 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -1,5 +1,5 @@ -
@@ -17,36 +17,36 @@
-
-
- -

Backup options

- -
@@ -59,7 +59,7 @@
- + Copy this text as it is to a safe place (notepad or email)
diff --git a/public/views/copayers.html b/public/views/copayers.html index dd6acf5c9..e773637f2 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -1,14 +1,14 @@ -
+ ng-init="">
-

Share this invitation with your copayers

+

Share this invitation with your copayers

@@ -21,9 +21,9 @@
- - + Share invitation
@@ -31,7 +31,7 @@ Waiting for copayers [ {{index.m}} of {{index.n}} ] - +
@@ -48,7 +48,7 @@

Wallet incomplete and broken

Delete it and create a new one

- @@ -58,4 +58,3 @@
- diff --git a/public/views/create.html b/public/views/create.html index 4f68ebf59..d721f7b13 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -1,12 +1,12 @@ -
-
+
@@ -21,6 +21,20 @@
+
+
+
+ Personal Wallet +
+
+ Shared Wallet +
+
+
@@ -35,7 +49,7 @@
@@ -47,10 +61,12 @@
-
+
@@ -65,9 +81,8 @@
- Show - Hide - Advanced options + Show Advanced options + Hide Advanced options @@ -75,23 +90,27 @@
- + +
diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html new file mode 100644 index 000000000..03a987300 --- /dev/null +++ b/public/views/disclaimer.html @@ -0,0 +1,29 @@ +
+
+ + + +
+

+ Terms of Use + Copay +

+
+

+ The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time. +

+ +
+

I affirm that I have read, understood, and agree with these terms.

+ +
+ +
+
+
diff --git a/public/views/import.html b/public/views/import.html index 6692cbb7f..6c6213392 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -1,5 +1,5 @@ -
@@ -19,7 +19,7 @@
-
+
@@ -49,20 +49,18 @@
- -
-

Have a Backup from Copay v0.9?

- - - -
+
+

Have a Backup from Copay v0.9?

+ +
diff --git a/public/views/importLegacy.html b/public/views/importLegacy.html index c4410aa78..ceac39936 100644 --- a/public/views/importLegacy.html +++ b/public/views/importLegacy.html @@ -1,29 +1,27 @@ -
- -
-
-
-

Importing...

-
    -
  • - {{m.message|translate}} -
-
+
+
+

Importing...

+
    +
  • + {{m.message|translate}} +
+
-
- - {{importLegacy.error|translate}} - -
+
+ + {{importLegacy.error|translate}} + +
-
+
-
-
-
- - {{error|translate}} - -
-
- -
- - Learn more about Wallet Migration - -
- +
+ + Learn more about Wallet Migration + +
- -
+
- diff --git a/public/views/includes/password.html b/public/views/includes/password.html index 9b4994192..42cd98f79 100644 --- a/public/views/includes/password.html +++ b/public/views/includes/password.html @@ -2,7 +2,7 @@
-
@@ -21,13 +21,13 @@
-
- +
- +
diff --git a/public/views/modals/confirmation.html b/public/views/modals/confirmation.html index a057c7a4e..1d56e2348 100644 --- a/public/views/modals/confirmation.html +++ b/public/views/modals/confirmation.html @@ -2,13 +2,13 @@

{{title|translate}}

-
-
diff --git a/public/views/modals/copayers.html b/public/views/modals/copayers.html index c1c167e42..fac3c376a 100644 --- a/public/views/modals/copayers.html +++ b/public/views/modals/copayers.html @@ -12,14 +12,17 @@ -
    -
  • - - {{copayer.name}} ({{'Me'|translate}}) - - - {{copayer.name}} - -
    • -
+
+
    +
  • + + {{copayer.name}} ({{'Me'|translate}}) + + + {{copayer.name}} + +
    • +
+
+
diff --git a/public/views/modals/customized-amount.html b/public/views/modals/customized-amount.html new file mode 100644 index 000000000..d37f32dd5 --- /dev/null +++ b/public/views/modals/customized-amount.html @@ -0,0 +1,80 @@ + + +
+
+

QR Code

+
    +
  • + +
    • +
+

Details

+
    +
  • + Address: + + {{addr}} + +
    • +
  • + Amount: + + {{customizedAmountUnit}} + {{customizedAlternativeUnit}} + +
    • +
+
+
+
+
+
+ + + Not valid + + + + +
+
+ +
+ + + {{unitName}} +
+
+
+ +
+ + + {{ alternativeIsoCode }} +
+
+ +
+
+
+ +
+
diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html index 24148fe29..8d5a24c0b 100644 --- a/public/views/modals/paypro.html +++ b/public/views/modals/paypro.html @@ -6,54 +6,48 @@

- Payment protocol request + Payment request

-
-
-
-
- {{unitTotal}} {{unitName}} -
-
- {{ alternative }} {{ alternativeIsoCode }} -
+
+
+
+ {{unitTotal}} {{unitName}}
-
- -
- To: {{paypro.domain}} -
- - -
- Address: - - {{paypro.toAddress}} - -
- - -
- Certified by: - {{paypro.verifyData.caName}} - Untrusted -
- -
- Merchant message: - - {{paypro.memo}} - -
- -
- Expires: {{paypro.expires * 1000 | amTimeAgo }} +
+ {{ alternative }} {{ alternativeIsoCode }}
+ +

Details

+
    +
  • + Pay To: + {{paypro.domain}} +
    • +
  • + Address: + {{paypro.toAddress}} +
    • +
  • + Certified by: + + + {{paypro.verifyData.caName || paypro.verifyData}} + Untrusted + +
    • +
  • + Memo: + {{paypro.memo}} +
    • +
  • + Expires: + {{paypro.expires * 1000 | amTimeAgo }} +
    • +
+
-
- diff --git a/public/views/modals/scanner.html b/public/views/modals/scanner.html index 6d12d1cab..f82a3e8a8 100644 --- a/public/views/modals/scanner.html +++ b/public/views/modals/scanner.html @@ -5,12 +5,12 @@
-

+

QR-Scanner

-
+
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 6b578f101..84b397cfd 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -12,7 +12,7 @@ -
+
+-{{btx.amountStr}} {{settings.unitName}} @@ -22,7 +22,7 @@
-

Information

+

Details

  • To: @@ -68,7 +68,7 @@
-

Signatures

+

Participants

  • @@ -82,11 +82,12 @@
    -
    +
-
diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html index 5dc2bacda..5f24dacce 100644 --- a/public/views/modals/tx-status.html +++ b/public/views/modals/tx-status.html @@ -1,30 +1,43 @@ -
+
Payment Sent
- OKAY + OKAY
-
+ +
- {{statusStr|translate}} + Payment Proposal Created
- OKAY + OKAY
-
- -
- {{statusStr|translate}} + + +
+ +
+ Payment Accepted
- OKAY + OKAY +
+
+ +
+ +
+ Payment Rejected +
+
+ OKAY
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 774e8834c..4399d42eb 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -1,18 +1,18 @@ -
-

Information

+
+

Details

  • To: @@ -24,6 +24,10 @@ {{alternativeAmountStr}}
    • +
  • + Fee: + {{feeStr}} +
  • Time: @@ -66,7 +70,7 @@
-

Signatures

+

Participants

  • @@ -87,23 +91,23 @@
    - The transaction was removed by creator + The payment was removed by creator
    -
    -
    @@ -111,37 +115,37 @@
    - Transaction accepted... + Payment accepted...
    But not broadcasted. Try to send manually
    -
    - Transaction sent! + Payment sent!
    - Transaction finally rejected + Payment finally rejected
    -
    -
    - * Only transactions created by yourself with no peer signatures can be removed +
    +
    + * A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
    -
    +
    -
    diff --git a/public/views/modals/wallets.html b/public/views/modals/wallets.html new file mode 100644 index 000000000..6b4689bec --- /dev/null +++ b/public/views/modals/wallets.html @@ -0,0 +1,44 @@ + + +
    +
    +
    + + Getting address for wallet {{selectedWalletName}} ... +
    +
    + + +
    +
    diff --git a/public/views/paymentUri.html b/public/views/paymentUri.html index 9d3b97eea..8edb2dc97 100644 --- a/public/views/paymentUri.html +++ b/public/views/paymentUri.html @@ -5,31 +5,42 @@
    -
    -
    +
    +

    Bitcoin URI is NOT valid!

    -
    +

    Make a payment to

    -
    Address: {{uri.address.toString()}}
    -
    Amount: {{uri.amount}}
    -
    Message: {{uri.message}}
    -
    Network: {{uri.network}}
    +
    Address: {{payment.uri.address.toString()}}
    +
    Amount: {{payment.uri.amount}}
    +
    Message: {{payment.uri.message}}
    +
    Network: {{payment.uri.network}}
    +
    +
    +
    + + There are no wallets to make this payment + [testnet] + +
    +
    + + -

    Select a wallet

    -
    diff --git a/public/views/preferences.html b/public/views/preferences.html index d40d26613..bcc4ac0c7 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -9,7 +9,25 @@
      -

      {{index.walletName}} settings

      +

      {{index.alias}} [{{index.walletName}}] settings

      + + +
    • + Wallet Alias + + + {{index.alias||index.walletName}} + +
      • + +
    • + Email Notifications + + + Disabled + {{index.preferences.email}} + +
    • Color @@ -59,6 +77,14 @@ {{preferences.selectedAlternative.name}}
      • +
    • + Bitcoin Network Fee Policy + + + {{preferences.feeName|translate}} + +
      • +
    • Bitcore Wallet Service diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index f0b96d411..7be0a87cb 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -4,36 +4,39 @@ ng-init="titleSection='About Copay'; goBackToState = 'preferences'">
    -
    -
      +
      Copay

      Release Information

      -
    • - Version - - v{{v.version}} - -
      • -
    • - Commit hash - - #{{v.commitHash}} - -
      • +
        +
      • + Version + + v{{v.version}} + +
        • +
      • + Commit hash + + #{{v.commitHash}} + +
        • +

       

      -
    • - Session log - +
        +
      • - -
        • - -
      + Terms of Use +
      • +
    • + + Session log +
      • +
    diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html new file mode 100644 index 000000000..629974aa6 --- /dev/null +++ b/public/views/preferencesAlias.html @@ -0,0 +1,16 @@ +
    +
    + +
    +
    + + + +
    +

    Changing wallet alias only affects the local wallet name.

    +
    +
    diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html index acef1d2bc..68504ecbe 100644 --- a/public/views/preferencesBwsUrl.html +++ b/public/views/preferencesBwsUrl.html @@ -1,5 +1,5 @@ -
    @@ -10,7 +10,7 @@
    -
    diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index 425909eee..8998372a5 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -1,5 +1,5 @@ -
    @@ -13,8 +13,8 @@
    -

    Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED

    -
    diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html new file mode 100644 index 000000000..55cac6990 --- /dev/null +++ b/public/views/preferencesEmail.html @@ -0,0 +1,39 @@ +
    +
    + + + +
    + +
    +
    + + Saving preferences... +
    +
    + + +
    +
    + + {{prefEmail.error|translate}} + +
    + + + + +
    +

    Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more.

    +
    +
    diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html new file mode 100644 index 000000000..85191018b --- /dev/null +++ b/public/views/preferencesFee.html @@ -0,0 +1,22 @@ +
    +
    + + +
    +
    + {{fee.name|translate}} ({{fee.value}} bits per kB) + {{fee.name|translate}} ({{fee.value}} bits per kB) + +
    +
    +
    +Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion. +
    +
    + +
    + +
    diff --git a/public/views/splash.html b/public/views/splash.html index 92cef28fa..9fca6a0b6 100644 --- a/public/views/splash.html +++ b/public/views/splash.html @@ -26,8 +26,8 @@
- +

Already have a wallet?

- +
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 5adb08583..9e87c7d37 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -1,5 +1,5 @@ -
@@ -9,10 +9,10 @@
You do not have a wallet
- +
- +
@@ -46,6 +46,7 @@ "> Updating Wallet... Scanning Wallet funds... Recreating Wallet... + Generating .csv file...
@@ -74,9 +75,9 @@
-
- Could not update Wallet -
Tap to retry +
+ Could not update Wallet +
@@ -84,7 +85,7 @@
Tap to retry
-
+
{{index.totalBalanceStr}}
@@ -102,10 +103,10 @@
{{index.walletName | limitTo: 1}} + ng-style="{'background-color':index.backgroundColor}">{{ (index.alias || index.walletName) | limitTo: 1}}
- + Preferences @@ -113,18 +114,19 @@

- {{index.m}} of {{index.n}} + {{(index.alias || index.walletName)}}

- Multisignature wallet - Testnet + Multisignature wallet ({{index.m}} of {{index.n}}) + - Testnet

- {{index.m}} of {{index.n}} + {{(index.alias || index.walletName)}}

-
- Personal Wallet - Testnet +
+ Testnet
@@ -143,7 +145,7 @@ This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
- Recreate @@ -152,7 +154,7 @@
-

Spend proposals

+

Payment Proposals

@@ -195,13 +197,13 @@
- SKIP BACKUP
- Backup now @@ -213,8 +215,16 @@

My Bitcoin address

-
- + +
+ + {{home.addrError|translate}} + +
+ + +
+

- {{home.generatingAddress ? '...' : home.addr}} + {{home.generatingAddress ? '...' : home.addr[index.walletId]}}

@@ -236,8 +246,8 @@
- + Share address @@ -249,12 +259,18 @@
-
+
+ + + Request a specific amount + +
@@ -266,20 +282,37 @@ -->
-
+

-
- + + Send All + + +
+
+ + Available Balance: + {{index.availableBalanceStr }} + +
-
- - Available Balance: - {{index.availableBalanceStr }} - - - {{index.lockedBalanceStr}} - in pending transactions - +
+
+ +
+
+ + Available Balance: + {{index.availableBalanceStr }} + + + {{index.lockedBalanceStr}} + locked by pending payments + +

@@ -295,11 +328,9 @@
- - @@ -313,6 +344,9 @@
+ + +
@@ -377,11 +411,11 @@
-
- Cancel +
+ Cancel
-
- @@ -404,8 +438,8 @@
- Could not fetch transaction history -
Tap to retry +

Could not fetch transaction history

+ No transactions yet @@ -413,7 +447,7 @@
-
+
@@ -448,8 +482,9 @@ {{btx.message || btx.addressTo}}
-
-
+
+
+ + + + Download CSV file + +
diff --git a/src/css/main.css b/src/css/main.css index ca8f3f404..2300e15d3 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -3,6 +3,11 @@ * Copay main CSS * */ + body { + font-family: Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif; +} + + .panel h1, .panel h2, .panel h3, .panel h4, .panel h5, .panel h6, .panel p, .panel li, .panel dl { color: #2C3E50; } @@ -44,6 +49,13 @@ h4.title { font-size: 0.7rem; } +h4.title a { + text-transform: none; + font-weight: 400; + padding: 7px; + font-size: 12px; +} + body, html{ height:100%; width:100%; @@ -147,11 +159,14 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu .content { width:100%; position: absolute; - top: 46px; + top: 45px; bottom: 0; overflow: auto; } +.content.disclaimer { + top: 0; +} .logo-setup { text-align: center; @@ -338,6 +353,7 @@ ul.manage li { .size-72 { font-size: 72px; } .m5 {margin: 5px;} .m5t {margin-top: 5px;} +.m8t {margin-top: 8px;} .m5b {margin-bottom: 5px;} .m5r {margin-right: 5px;} .m10 {margin: 10px;} @@ -610,7 +626,6 @@ table tbody tr:last-child td { button.outline, button.outline:hover, button.outline:focus { - border-radius: 3px; background: transparent; } @@ -620,7 +635,6 @@ button.outline:focus { button.outline.tiny, button.outline.tiny:hover, button.outline.tiny:focus { - border-radius: 3px; background: transparent; } @@ -647,7 +661,12 @@ button.outline.light-gray:focus { color: #7A8C9E; } -.button.outline.white { +.button.outline.white, +.button.outline.white:hover, +.button.outline.white:focus, +button.outline.white, +button.outline.white:hover, +button.outline.white:focus { background-color: transparent; border: 1px solid #fff; color: #fff; @@ -662,7 +681,6 @@ button.secondary:focus, .button.secondary:focus { background-color: #008CC1; color: #fff; - border-radius: 3px; } /* PRIMARY */ @@ -674,7 +692,6 @@ button.primary:focus, .button.primary:focus { background-color: #1ABC9C; color: #fff; - border-radius: 3px; } /* WARNING */ @@ -686,55 +703,47 @@ button.warning:focus, .button.warning:focus { background-color: #ED4A43; color: #fff; - border-radius: 3px; } /* WHITE */ button.white, -.button.white { +button.white:hover, +button.white:focus, +.button.white, +.button.white:hover, +.button.white:focus { background-color: #fff; color: #2C3E50; } /* BLACK */ button.black, -.button.black { +button.black:hover, +button.black:focus, +.button.black, +.button.black:hover, +.button.black:focus { background-color: #2C3E50; color: #fff; } /* GRAY */ button.gray, -.button.gray { +button.gray:hover, +button.gray:focus, +.button.gray, +.button.gray:hover, +.button.gray:focus { background-color: #A9B2B8; color: #2C3E50; } -button.disabled.black, -button[disabled].black, -.button.disabled.black, -.button[disabled].black, -button.disabled.white, -button[disabled].white, -.button.disabled.white, -.button[disabled].white, -button.disabled.warning, -button[disabled].warning, -.button.disabled.warning, -.button[disabled].warning, -button.disabled.primary, -button[disabled].primary, -.button.disabled.primary, -.button[disabled].primary, -button.disabled.secondary, -button[disabled].secondary, -.button.disabled.secondary, -.button[disabled].secondary { +button.disabled, button[disabled], .button.disabled, .button[disabled] { + border-color: transparent !important; background-color: #A5B2BF !important; - color: #fff; + color: #fff !important; } - .button, button { text-transform: uppercase; transition: none !important; @@ -797,47 +806,14 @@ label.postfix, a.postfix { width: 40px; } -.photo-container { - margin-right: 3px; - display: inline-block; - width: 35px; - height: 35px; - color: #fff; - background: #7A8C9E; - border-radius: 100%; - vertical-align: middle; - overflow: hidden; - text-align: center; -} - -.photo-container.profile { - width: 80px; - height: 80px; -} - -.need-backup { - background: #ED4A43; - -moz-box-shadow: 1px 1px 0px 0px #A02F23; - box-shadow: 1px 1px 0px 0px #A02F23; - position: absolute; - top: 22px; - left: 0px; - width: 14px; - height: 14px; - border-radius: 100%; - font-size: 9px; - padding-top: 2px; - color: #fff; -} - .pointer { cursor: pointer; } .input.block i { position: absolute; - top: 5px; - left: 10px; + top: 2px; + left: 15px; font-size: 20px; color: #7A8C9E; border-right: 1px solid #ccc; @@ -1138,6 +1114,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus { cursor: pointer !important; } +.preferences-icon { + padding: 0.6rem 0.8rem !important; +} + .passModal { background: #FFFFFF; box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.50); diff --git a/src/css/mobile.css b/src/css/mobile.css index f4fab59a6..8b0538674 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -11,6 +11,8 @@ body { -khtml-user-select: none; -ms-user-select: none; user-select: none; + -webkit-touch-callout: none !important; + -webkit-overflow-scrolling: touch; } input { @@ -24,10 +26,11 @@ input { -webkit-user-drag: none; -ms-user-drag: none; user-drag: none; + -webkit-tap-highlight-color:rgba(0,0,0,0); } -body, div, .row { - -webkit-overflow-scrolling: touch; +.fix-modals-touch { + -webkit-overflow-scrolling: auto; } .enable_text_select { @@ -88,12 +91,8 @@ _:-ms-fullscreen, :root .main { .tab-bar { background: #FFFFFF; - box-shadow: 0px 1px 1px 0px rgba(0,0,0,0.10); - display: block; - position: fixed; - width: 100%; z-index: 5; - line-height: 3.2rem; + border-bottom: 1px solid #E9E9EC; } .tab-bar h1 { @@ -204,8 +203,8 @@ _:-ms-fullscreen, :root .main { .walletHome .wallet-info { margin-left: 85px; line-height: 110%; - float: left; - margin-bottom: 20px; + height: 60px; + overflow: hidden; } .copayers { @@ -246,6 +245,7 @@ ul.copayer-list img { font-size: 14px; } + a.missing-copayers { bottom: -34px; text-align: center; @@ -255,6 +255,8 @@ a.missing-copayers { .button, button { padding: 1rem 1.2rem 1.0625rem; + border: 1px solid transparent; + font-family: Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif; } .box-setup { @@ -272,7 +274,6 @@ a.missing-copayers { .sidebar { background: #2C3E50; - box-shadow: inset -2px 0px 1px 0px rgba(0,0,0,0.40); } .sidebar li { @@ -282,10 +283,9 @@ a.missing-copayers { .sidebar li.nav-item.selected { background-color: #122232; - box-shadow: inset -1px 0px 1px 0px rgba(0,0,0,0.20); } -.sidebar .avatar-wallet, .payment-uri .avatar-wallet { +.sidebar .avatar-wallet, .payment-uri .avatar-wallet, .modal-content .avatar-wallet { background-color: #2C3E50; color: #fff; font-size: 20px; @@ -301,9 +301,7 @@ a.missing-copayers { } .sidebar header { - width: 100%; text-align: center; - height: 7rem; padding: 1.7rem; border-bottom: 1px solid #384B5F; } @@ -322,7 +320,7 @@ a.missing-copayers { margin-bottom: 30px; } -.sidebar ul.off-canvas-list li a { +.sidebar ul.off-canvas-list li a, .modal-content ul li a { font-size: 12px; font-weight: 300; border-bottom: transparent; @@ -358,13 +356,6 @@ ul.off-canvas-list li a:hover { background: none; } -a, button, .button, input, textarea, select { - -webkit-box-shadow: none !important; - -moz-box-shadow: none !important; - box-shadow: none !important; - -webkit-tap-highlight-color:rgba(0,0,0,0); -} - .move-right .close-menu { cursor: pointer; box-shadow: none; @@ -381,7 +372,7 @@ a, button, .button, input, textarea, select { /* === */ -/* Have to set height explicity on ui-view +/* Have to set height explicity on ui-view to prevent collapsing during animation*/ .main[ui-view]{ height: 100%; /* TODO */ @@ -408,7 +399,7 @@ to prevent collapsing during animation*/ animation-duration: .3s; animation-iteration-count: 1; animation-fill-mode: both; - + -webkit-animation-timing-function: ease-in-out; -webkit-animation-duration: .3s; -webkit-animation-iteration-count: 1; @@ -416,8 +407,6 @@ to prevent collapsing during animation*/ } .CslideInUp { - transform: translate3d(0, 100%, 0); - -webkit-transform: translate3d(0, 100%, 0); -webkit-animation-name: slideInUp; animation-name: slideInUp; z-index: 1003; @@ -433,8 +422,6 @@ to prevent collapsing during animation*/ z-index: 1003; } .CslideInRight { - -webkit-transform: translate3d(100%, 0, 0); - transform: translate3d(100%, 0, 0); -webkit-animation-name: slideInRight; animation-name: slideInRight; z-index: 1003; @@ -572,18 +559,34 @@ to prevent collapsing during animation*/ top: 0 !important; } +.modal-content { + position: fixed; + overflow-y: auto; + height: 100%; + width: 100%; + top: 45px; + padding-bottom: 33px; + -webkit-transform: translate3d(0,0,0); + background: #fff; +} + +body.modal-open { + position: fixed; + overflow: hidden; +} + .reveal-modal { padding: 0; border: none; border-radius: 0; - overflow-y: auto; - padding-bottom: 20px; + outline: 0; + box-shadow: none; } -.reveal-modal.animated.slideInRight, -.reveal-modal.animated.slideOutRight, -.reveal-modal.animated.fadeOutUp, -.reveal-modal.animated.slideInUp, +.reveal-modal.animated.slideInRight, +.reveal-modal.animated.slideOutRight, +.reveal-modal.animated.fadeOutUp, +.reveal-modal.animated.slideInUp, .reveal-modal.animated.slideInDown { -webkit-animation-duration: 0.3s; animation-duration: 0.3s; @@ -603,6 +606,8 @@ input[type="text"], input[type="time"], input[type="url"], input[type="week"], +input, +select, textarea, input[type="text"]:focus, input[type="password"]:focus, @@ -618,8 +623,11 @@ input[type="tel"]:focus, input[type="time"]:focus, input[type="url"]:focus, input[type="color"]:focus, +input:focus, +select:focus, textarea:focus { + outline: 0; opacity: 1; /*CSS transitions*/ -o-transition-property: none !important; @@ -713,7 +721,7 @@ textarea:focus transform: translate3d(-100%, 0, 0); width:100%; position: absolute; - top: 46px; + top: 45px; bottom: 37px; overflow: auto; padding-bottom: 40px; @@ -729,6 +737,39 @@ textarea:focus transform: translate3d(-100%, 0, 0) !important; } +.create-tab { + width: 100%; + border-bottom: 1px solid #DEDFE1; + margin-bottom: 25px; + padding: 0 0 .5rem 1rem; + overflow: hidden; +} + +.create-tab .tab-container { + float: left; +} + + +.create-tab a { + font-size: .7rem; + padding: 0 0 .6rem; + color: #929396; + text-transform: uppercase; + font-weight: 500; +} + +.create-tab a:hover, +.create-tab a:focus { + border-bottom: 3px solid #929396; +} + +.create-tab a.selected, +.create-tab a:active { + font-weight: 600; + color: #2C3E50; + border-bottom: 3px solid #2C3E50; +} + /* removes 300ms in IE */ -ms-touch-action: manipulation; /* IE10 / touch-action: manipulation; /* IE11+ */ diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 6959b7144..0aec01726 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -1,4 +1,3 @@ - 'use strict'; angular.module('copayApp.controllers').controller('backupController', @@ -45,6 +44,9 @@ angular.module('copayApp.controllers').controller('backupController', } window.plugins.toast.showShortCenter('Preparing backup...'); var name = (fc.credentials.walletName || fc.credentials.walletId); + if (fc.alias) { + name = fc.alias + ' [' + name + ']'; + } var ew = this.getBackup(); var properties = { subject: 'Copay Wallet Backup: ' + name, diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 02cbfa2d9..c696d487b 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -29,18 +29,19 @@ angular.module('copayApp.controllers').controller('createController', } var updateRCSelect = function(n) { + $scope.totalCopayers = n; var maxReq = COPAYER_PAIR_LIMITS[n]; self.RCValues = lodash.range(1, maxReq + 1); $scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq); }; - $scope.$watch('totalCopayers', function(tc) { - updateRCSelect(tc); - }); - - this.TCValues = lodash.range(1, defaults.limits.totalCopayers + 1); + this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1); $scope.totalCopayers = defaults.wallet.totalCopayers; + this.setTotalCopayers = function(tc) { + updateRCSelect(tc); + }; + this.create = function(form) { if (form && form.$invalid) { this.error = gettext('Please enter the required fields'); @@ -75,9 +76,14 @@ angular.module('copayApp.controllers').controller('createController', if (what && what == 'my-name') { this.hideWalletName = true; + this.hideTabs = true; + } + else if (what && what == 'wallet-name'){ + this.hideTabs = true; } else { this.hideWalletName = false; + this.hideTabs = false; } $timeout(function() { $rootScope.$digest(); diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index e3b4388d2..9048332ca 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,7 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, gettextCatalog, gettext, amMoment) { - +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit) { var self = this; self.isCordova = isCordova; self.onGoingProcess = {}; @@ -38,6 +37,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.tab = 'walletHome'; self.availableLanguages = [{ + name: gettext('Deutsch'), + isoCode: 'de', + }, { name: gettext('English'), isoCode: 'en', }, { @@ -49,6 +51,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r }, { name: gettext('Japanese'), isoCode: 'ja', + }, { + name: gettext('Portuguese'), + isoCode: 'pt', }]; self.setOngoingProcess = function(processName, isOn) { @@ -75,6 +80,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r // Clean status self.lockedBalance = null; + self.availableBalanceStr = null; + self.totalBalanceStr = null; + self.lockedBalanceStr = null; self.totalBalanceStr = null; self.alternativeBalanceAvailable = false; self.totalBalanceAlternative = null; @@ -82,7 +90,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.txHistory = []; self.txHistoryPaging = false; self.pendingTxProposalsCountForUs = null; - $timeout(function() { self.hasProfile = true; self.noFocusedWallet = false; @@ -102,6 +109,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.txps = []; self.copayers = []; self.updateColor(); + self.updateAlias(); storageService.getBackupFlag(self.walletId, function(err, val) { self.needsBackup = self.network == 'testnet' ? false : !val; @@ -144,17 +152,84 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$emit('Local/TabChanged', tab); }; - self.updateAll = function(walletStatus) { + + self._updateRemotePreferencesFor = function(clients, prefs, cb) { + var client = clients.shift(); + + if (!client) + return cb(); + + $log.debug('Saving remote preferences', client.credentials.walletName, prefs); + client.savePreferences(prefs, function(err) { + // we ignore errors here + if (err) $log.warn(err); + + self._updateRemotePreferencesFor(clients, prefs, cb); + }); + }; + + + self.updateRemotePreferences = function(opts, cb) { + var prefs = opts.preferences || {}; + var fc = profileService.focusedClient; + + // Update this JIC. + var config = configService.getSync().wallet.settings; + + //prefs.email (may come from arguments) + prefs.language = self.defaultLanguageIsoCode; + prefs.unit = config.unitCode; + + var clients = []; + if (opts.saveAll) { + clients = lodash.values(profileService.walletClients); + } else { + clients = [fc]; + }; + + self._updateRemotePreferencesFor(clients, prefs, function(err) { + if (err) return cb(err); + if (!fc) return cb(); + + fc.getPreferences(function(err, preferences) { + if (err) { + return cb(err); + } + self.preferences = preferences; + return cb(); + }); + }); + }; + + var _walletStatusHash = function(walletStatus) { + var bal; + if (walletStatus) { + bal = walletStatus.balance.totalAmount; + } else { + bal = self.totalBalanceSat; + } + return bal; + }; + + self.updateAll = function(opts, initStatusHash, tries) { + tries = tries || 0; + opts = opts || {}; + + if (opts.untilItChanges && lodash.isUndefined(initStatusHash)) { + initStatusHash = _walletStatusHash(); + $log.debug('Updating status until it changes. initStatusHash:' + initStatusHash) + } var get = function(cb) { - if (walletStatus) - return cb(null, walletStatus); + if (opts.walletStatus) + return cb(null, opts.walletStatus); else { self.updateError = false; return fc.getStatus(function(err, ret) { if (err) { self.updateError = true; } else { - self.setOngoingProcess('scanning', ret.wallet.scanning); + if (!opts.quiet) + self.setOngoingProcess('scanning', ret.wallet.scanning); } return cb(err, ret); }); @@ -165,10 +240,27 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (!fc) return; $timeout(function() { - self.setOngoingProcess('updatingStatus', true); - $log.debug('Updating Status:', fc); + + if (!opts.quiet) + self.setOngoingProcess('updatingStatus', true); + + $log.debug('Updating Status:', fc, tries); get(function(err, walletStatus) { - self.setOngoingProcess('updatingStatus', false); + var currentStatusHash = _walletStatusHash(walletStatus); + $log.debug('Status update. hash:' + currentStatusHash + ' Try:' + tries); + if (!err && opts.untilItChanges && initStatusHash == currentStatusHash && tries < 7) { + return $timeout(function() { + $log.debug('Retrying update... Try:' + tries) + return self.updateAll({ + walletStatus: null, + untilItChanges: true, + triggerTxUpdate: opts.triggerTxUpdate, + }, initStatusHash, ++tries); + }, 1400 * tries); + } + if (!opts.quiet) + self.setOngoingProcess('updatingStatus', false); + if (err) { self.handleError(err); return; @@ -182,8 +274,18 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.walletStatus = walletStatus.wallet.status; self.walletScanStatus = walletStatus.wallet.scanStatus; self.copayers = walletStatus.wallet.copayers; + self.preferences = walletStatus.preferences; self.setBalance(walletStatus.balance); + self.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) { + return w.id != self.walletId; + });; $rootScope.$apply(); + + if (opts.triggerTxUpdate) { + $timeout(function() { + self.updateTxHistory(); + }, 1); + } }); }); }; @@ -245,7 +347,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.updatingTxHistory = false; if (err) { $log.debug('TxHistory ERROR:', err); - self.handleError(err); + // We do not should errors here, since history is usually + // fetched AFTER others requests. + //self.handleError(err); self.txHistoryError = true; } else { $log.debug('Wallet Transaction History:', txs); @@ -281,7 +385,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r return; } $log.debug('Wallet Opened'); - self.updateAll(lodash.isObject(walletStatus) ? walletStatus : null); + self.updateAll(lodash.isObject(walletStatus) ? { + walletStatus: walletStatus + } : null); $rootScope.$apply(); }); }); @@ -293,6 +399,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r lodash.each(txps, function(tx) { var amount = tx.amount * self.satToUnit; tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName; + tx.feeStr = profileService.formatAmount(tx.fee) + ' ' + config.unitName; tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode; tx.alternativeIsoCode = config.alternativeIsoCode; @@ -315,9 +422,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r tx.statusForUs = 'pending'; } - if (tx.creatorId == self.copayerId && tx.actions.length == 1) { - tx.couldRemove = true; - }; + if (!tx.deleteLockTime) + tx.canBeRemoved = true; if (tx.creatorId != self.copayerId) { self.pendingTxProposalsCountForUs = self.pendingTxProposalsCountForUs + 1; @@ -327,14 +433,15 @@ angular.module('copayApp.controllers').controller('indexController', function($r }; self.setTxHistory = function(txs) { - var now = new Date(); + var now = Math.floor(Date.now() / 1000); var c = 0; self.txHistoryPaging = txs[self.limitHistory] ? true : false; lodash.each(txs, function(tx) { - tx.ts = tx.minedTs || tx.sentTs; - // no future transaction... - if (tx.ts > now) - ts.ts = now; + + // no future transactions... + if (tx.time > now) + tx.time = now; + tx.rateTs = Math.floor((tx.ts || now) / 1000); tx.amountStr = profileService.formatAmount(tx.amount); //$filter('noFractionNumber')( if (c < self.limitHistory) { @@ -344,10 +451,18 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }; + self.updateAlias = function() { + var config = configService.getSync(); + config.aliasFor = config.aliasFor || {}; + self.alias = config.aliasFor[self.walletId]; + var fc = profileService.focusedClient; + fc.alias = self.alias; + }; + self.updateColor = function() { var config = configService.getSync(); config.colorFor = config.colorFor || {}; - self.backgroundColor = config.colorFor[self.walletId] || '#7A8C9E'; + self.backgroundColor = config.colorFor[self.walletId] || '#4A90E2'; var fc = profileService.focusedClient; fc.backgroundColor = self.backgroundColor; }; @@ -379,6 +494,16 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.lockedBalanceBTC = strip(self.lockedBalanceSat / COIN); self.availableBalanceBTC = strip(self.availableBalanceBTC / COIN); + // KB to send max + self.feePerKbSat = config.feeValue || 10000; + if (balance.totalKbToSendMax) { + var feeToSendMaxSat = balance.totalKbToSendMax * self.feePerKbSat; + + self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit); + self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName; + } else { + self.feeToSendMaxStr = null; + } //STR self.totalBalanceStr = profileService.formatAmount(self.totalBalanceSat) + ' ' + self.unitName; @@ -389,7 +514,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.alternativeIsoCode = config.alternativeIsoCode; // Check address - self.checkLastAddress(balance.byAddress); + addressService.isUsed(self.walletId, balance.byAddress, function(err, used) { + if (used) { + $log.debug('Address used. Creating new'); + $rootScope.$emit('Local/NeedNewAddress'); + } + }); rateService.whenAvailable(function() { @@ -413,22 +543,116 @@ angular.module('copayApp.controllers').controller('indexController', function($r } }; - self.checkLastAddress = function(byAddress, cb) { - storageService.getLastAddress(self.walletId, function(err, addr) { - var used = lodash.find(byAddress, { - address: addr - }); - if (used) { - $log.debug('Address ' + addr + ' was used. Cleaning Cache.') - storageService.clearLastAddress(self.walletId, function(err) { - $rootScope.$emit('Local/NeedNewAddress', err); - if (cb) return cb(); + this.csvHistory = function() { + + function saveFile(name, data) { + var chooser = document.querySelector(name); + chooser.addEventListener("change", function(evt) { + var fs = require('fs'); + fs.writeFile(this.value, data, function(err) { + if (err) { + $log.debug(err); + } }); - }; + }, false); + chooser.click(); + } + + function formatDate(date) { + var dateObj = new Date(date); + if (!dateObj) { + $log.debug('Error formating a date'); + return 'DateError' + } + if (!dateObj.toJSON()) { + return ''; + } + + return dateObj.toJSON(); + } + + function formatString(str) { + if (!str) return ''; + + if (str.indexOf('"') !== -1) { + //replace all + str = str.replace(new RegExp('"', 'g'), '\''); + } + + //escaping commas + str = '\"' + str + '\"'; + + return str; + } + + function getHistory(skip, cb) { + skip = skip || 0; + fc.getTxHistory({ + skip: skip, + limit: 100 + }, function(err, txs) { + if (err) return cb(err); + if (txs && txs.length > 0) { + allTxs.push(txs); + return getHistory(skip + 100, cb); + } + else { + return cb(null, lodash.flatten(allTxs)); + } + }); + }; + + if (isCordova) { + $log.info('Not available on mobile'); + return; + } + var isNode = nodeWebkit.isDefined(); + var fc = profileService.focusedClient; + if (!fc.isComplete()) return; + var self = this; + var allTxs = []; + $log.debug('Generating CSV from History'); + self.setOngoingProcess('generatingCSV', true); + $timeout(function() { + getHistory(null, function(err, txs) { + self.setOngoingProcess('generatingCSV', false); + if (err) { + $log.debug('TxHistory ERROR:', err); + } else { + $log.debug('Wallet Transaction History:', txs); + + self.satToUnit = 1 / self.unitToSatoshi; + var data = txs; + var satToBtc = 1 / 100000000; + var filename = 'Copay-' + (self.alias || self.walletName ) + '.csv'; + var csvContent = ''; + if (!isNode) csvContent = 'data:text/csv;charset=utf-8,'; + csvContent += 'Date,Destination,Note,Amount,Currency,Spot Value,Total Value,Tax Type,Category\n'; + + var _amount; + var dataString; + data.forEach(function(it, index) { + _amount = (it.action == 'sent' ? '-' : '') + (it.amount * satToBtc).toFixed(8); + dataString = formatDate(it.time * 1000) + ',' + formatString(it.addressTo) + ',' + formatString(it.message) + ',' + _amount + ',BTC,,,,'; + csvContent += index < data.length ? dataString + "\n" : dataString; + }); + + if (isNode) { + saveFile('#export_file', csvContent); + } + else { + var encodedUri = encodeURI(csvContent); + var link = document.createElement("a"); + link.setAttribute("href", encodedUri); + link.setAttribute("download", filename); + link.click(); + } + } + $rootScope.$apply(); + }); }); }; - self.clientError = function(err) { if (isCordova) { navigator.notification.confirm( @@ -496,49 +720,35 @@ angular.module('copayApp.controllers').controller('indexController', function($r c.startScan({ includeCopayerBranches: true, }, function(err) { - if (err) { - if (self.walletId == walletId) - self.setOngoingProcess('scanning', false); + if (err && self.walletId == walletId) { + self.setOngoingProcess('scanning', false); self.handleError(err); $rootScope.$apply(); } }); }; - self.setDefaultLanguage = function(setLang) { - var userLang; - if (!setLang) { - userLang = configService.getSync().wallet.settings.defaultLanguage; - if (!userLang) { - // Auto-detect browser language - var androidLang; + self.setUxLanguage = function() { + var userLang = configService.getSync().wallet.settings.defaultLanguage; + if (!userLang) { + // Auto-detect browser language + var androidLang; - if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) { - userLang = androidLang[1]; - } else { - // works for iOS and Android 4.x - userLang = navigator.userLanguage || navigator.language; - } - userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en'; + if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) { + userLang = androidLang[1]; + } else { + // works for iOS and Android 4.x + userLang = navigator.userLanguage || navigator.language; } - if (userLang != gettextCatalog.getCurrentLanguage()) { - $log.debug('Setting default language: ' + userLang); - gettextCatalog.setCurrentLanguage(userLang); - amMoment.changeLocale(userLang); - } - } else { - configService.set({ - wallet: { - settings: { - defaultLanguage: setLang - } - } - }, function() { - gettextCatalog.setCurrentLanguage(setLang); - amMoment.changeLocale(setLang); - }); + userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en'; } - self.defaultLanguageIsoCode = setLang || userLang; + if (userLang != gettextCatalog.getCurrentLanguage()) { + $log.debug('Setting default language: ' + userLang); + gettextCatalog.setCurrentLanguage(userLang); + amMoment.changeLocale(userLang); + } + + self.defaultLanguageIsoCode = userLang; self.defaultLanguageName = lodash.result(lodash.find(self.availableLanguages, { 'isoCode': self.defaultLanguageIsoCode }), 'name'); @@ -552,14 +762,59 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }); + $rootScope.$on('Local/AliasUpdated', function(event) { + self.updateAlias(); + $timeout(function() { + $rootScope.$apply(); + }); + }); + + $rootScope.$on('Local/ProfileBound', function() { + storageService.getRemotePrefsStoredFlag(function(err, val) { + if (err || val) return; + self.updateRemotePreferences({ + saveAll: true + }, function() { + $log.debug('Remote preferences saved') + storageService.setRemotePrefsStoredFlag(function() {}); + }); + }); + }); + + $rootScope.$on('Local/NewFocusedWallet', function() { + self.setUxLanguage(); + }); + + $rootScope.$on('Local/LanguageSettingUpdated', function() { + self.setUxLanguage(); + self.updateRemotePreferences({ + saveAll: true + }, function() { + $log.debug('Remote preferences saved') + }); + }); + $rootScope.$on('Local/UnitSettingUpdated', function(event) { self.updateAll(); self.updateTxHistory(); + self.updateRemotePreferences({ + saveAll: true + }, function() { + $log.debug('Remote preferences saved') + }); }); + $rootScope.$on('Local/EmailSettingUpdated', function(event, email, cb) { + self.updateRemotePreferences({ + preferences: { + email: email + }, + }, cb); + }); $rootScope.$on('Local/BWSUpdated', function(event) { profileService.applyConfig(); + storageService.setCleanAndScanAddresses(function() {}); }); $rootScope.$on('Local/WalletCompleted', function(event) { @@ -568,7 +823,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); self.debouncedUpdate = lodash.throttle(function() { - self.updateAll(); + self.updateAll({ + quiet: true + }); self.updateTxHistory(); }, 4000, { leading: false, @@ -576,31 +833,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); - // No need ot listing to Local/Resume since - // reconnection and Local/Online will be triggered - lodash.each(['Local/Online', 'Local/Resume'], function(eventName) { - $rootScope.$on(eventName, function(event) { - $log.debug('### ' + eventName + ' event'); - self.debouncedUpdate(); - }); - }); - - $rootScope.$on('Local/Online', function(event) { - self.isOffline = false; - self.offLineSince = null; - }); - - self.offLineSince = null;; - $rootScope.$on('Local/Offline', function(event) { - $log.debug('### Offline event'); - if (!self.offLineSince) self.offLineSince = Date.now(); - - if (Date.now() - self.offLineSince > 10000) { - self.isOffline = true; - $timeout(function() { - $rootScope.$apply(); - }); - } + $rootScope.$on('Local/Resume', function(event) { + $log.debug('### Resume event'); + self.debouncedUpdate(); }); $rootScope.$on('Local/BackupDone', function(event) { @@ -631,13 +866,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r go.walletHome(); } else if (err && err.cors == 'rejected') { $log.debug('CORS error:', err); - } else if (err.code === 'ETIMEDOUT') { + } else if (err.code === 'ETIMEDOUT' || err.code === 'CONNERROR') { $log.debug('Time out:', err); } else { var msg = 'Error at Wallet Service: '; if (err.message) msg = msg + err.message; else if (err.error) msg = msg + err.error; - else msg = msg + err; + else msg = msg + (lodash.isObject(err) ? JSON.stringify(err) : err); self.clientError(msg); } $rootScope.$apply(); @@ -646,59 +881,37 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/WalletImported', function(event, walletId) { self.needsBackup = false; storageService.setBackupFlag(walletId, function() { - storageService.clearLastAddress(walletId, function(err) { + addressService.expireAddress(walletId, function(err) { self.startScan(walletId); }); }); }); - $rootScope.$on('Local/DefaultLanguage', function(event, setLang) { - self.setDefaultLanguage(setLang); - }); - - $rootScope.$on('Animation/Disable', function(event) { - $timeout(function() { - self.slideLeft = false; - self.slideRight = false; - self.slideUp = false; - self.slideDown = false; - }, 400); - }); - - $rootScope.$on('Animation/SlideLeft', function(event) { - self.slideLeft = true; - }); - - $rootScope.$on('Animation/SlideRight', function(event) { - self.slideRight = true; - }); - - $rootScope.$on('Animation/SlideUp', function(event) { - self.slideUp = true; - }); - - $rootScope.$on('Animation/SlideDown', function(event) { - self.slideDown = true; - }); - $rootScope.$on('NewIncomingTx', function() { - self.updateBalance(); - $timeout(function() { - self.updateTxHistory(); - }, 5000); + self.updateAll({ + walletStatus: null, + untilItChanges: true, + triggerTxUpdate: true, + }); }); + $rootScope.$on('NewOutgoingTx', function() { + self.updateAll({ + walletStatus: null, + untilItChanges: true, + triggerTxUpdate: true, + }); + }); - // remove transactionProposalRemoved (only for compat) - - lodash.each(['NewOutgoingTx', 'NewTxProposal', 'TxProposalFinallyRejected', 'transactionProposalRemoved', 'TxProposalRemoved', + lodash.each(['NewTxProposal', 'TxProposalFinallyRejected', 'TxProposalRemoved', 'Local/NewTxProposal', 'Local/TxProposalAction', 'ScanFinished' ], function(eventName) { - $rootScope.$on(eventName, function() { - self.updateAll(); - $timeout(function() { - self.updateTxHistory(); - }, 3000); + $rootScope.$on(eventName, function(event, untilItChanges) { + self.updateAll({ + walletStatus: null, + untilItChanges: untilItChanges, + triggerTxUpdate: true, + }); }); }); @@ -729,6 +942,18 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setFocusedWallet(); self.updateTxHistory(); go.walletHome(); + storageService.getCleanAndScanAddresses(function(err, val) { + if (val) { + $log.debug('Clear last address cache and Scan'); + lodash.each(lodash.keys(profileService.walletClients), function(walletId) { + addressService.expireAddress(walletId, function(err) { + self.startScan(walletId); + }); + }); + storageService.removeCleanAndScanAddresses(function() {}); + } + }); + }); $rootScope.$on('Local/SetTab', function(event, tab, reset) { diff --git a/src/js/controllers/paymentUri.js b/src/js/controllers/paymentUri.js index 2dac95c32..9d88f35eb 100644 --- a/src/js/controllers/paymentUri.js +++ b/src/js/controllers/paymentUri.js @@ -29,30 +29,16 @@ angular.module('copayApp.controllers').controller('paymentUriController', var satToUnit = 1 / unitToSatoshi; var unitName = config.unitName; - uri.amount = strip(uri.amount * satToUnit) + ' ' + unitName; + if (uri.amount) { + uri.amount = strip(uri.amount * satToUnit) + ' ' + unitName; + } uri.network = uri.address.network.name; - return uri; + this.uri = uri; } }; this.getWallets = function(network) { - if (!profileService.profile) return; - var config = configService.getSync(); - config.colorFor = config.colorFor || {}; - var ret = lodash.map(profileService.profile.credentials, function(c) { - return { - m: c.m, - n: c.n, - name: c.walletName, - id: c.walletId, - network: c.network, - color: config.colorFor[c.walletId] || '#2C3E50' - }; - }); - ret = lodash.filter(ret, function(w) { - return (w.network == network); - }); - return lodash.sortBy(ret, 'walletName'); + return profileService.getWallets(network); }; this.selectWallet = function(wid) { diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index 742db5a84..e19db43dc 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesController', function($scope, $rootScope, $filter, $timeout, $modal, $log, lodash, configService, profileService) { var config = configService.getSync(); this.unitName = config.wallet.settings.unitName; + this.feeName = config.wallet.settings.feeName || 'Priority'; this.bwsurl = config.bws.url; this.selectedAlternative = { name: config.wallet.settings.alternativeName, diff --git a/src/js/controllers/preferencesAlias.js b/src/js/controllers/preferencesAlias.js new file mode 100644 index 000000000..385f4e258 --- /dev/null +++ b/src/js/controllers/preferencesAlias.js @@ -0,0 +1,32 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesAliasController', + function($scope, $timeout, configService, profileService, go) { + var config = configService.getSync(); + var fc = profileService.focusedClient; + var walletId = fc.credentials.walletId; + + var config = configService.getSync(); + config.aliasFor = config.aliasFor || {}; + this.alias = config.aliasFor[walletId] || fc.credentials.walletName; + + this.save = function() { + var self = this; + var opts = { + aliasFor: {} + }; + opts.aliasFor[walletId] = self.alias; + + configService.set(opts, function(err) { + if (err) { + $scope.$emit('Local/DeviceError', err); + return; + } + $scope.$emit('Local/AliasUpdated'); + $timeout(function(){ + go.path('preferences'); + }, 50); + }); + + }; + }); diff --git a/src/js/controllers/preferencesBwsUrl.js b/src/js/controllers/preferencesBwsUrl.js index cf4483f70..9702e2201 100644 --- a/src/js/controllers/preferencesBwsUrl.js +++ b/src/js/controllers/preferencesBwsUrl.js @@ -21,8 +21,7 @@ angular.module('copayApp.controllers').controller('preferencesBwsUrlController', configService.set(opts, function(err) { if (err) console.log(err); $scope.$emit('Local/BWSUpdated'); - applicationService.restart(true); - go.walletHome(); + applicationService.restart(); }); }; diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index d01a878fb..3728afd8e 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -4,14 +4,17 @@ angular.module('copayApp.controllers').controller('preferencesColorController', function($scope, configService, profileService, go) { var config = configService.getSync(); this.colorOpts = [ - '#7A8C9E', '#F38F12', - '#F4D03F', + '#FAA77F', + '#FADA58', + '#9EDD72', + '#77DADA', '#4A90E2', '#484ED3', '#9B59B6', '#E856EF', - '#F883B4', + '#FF599E', + '#7A8C9E', ]; var fc = profileService.focusedClient; @@ -19,7 +22,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController', var config = configService.getSync(); config.colorFor = config.colorFor || {}; - this.color = config.colorFor[walletId] || '#7A8C9E'; + this.color = config.colorFor[walletId] || '#4A90E2'; this.save = function(color) { var self = this; diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index 448dc0b0d..cfd6dfa39 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -34,14 +34,15 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro var _deleteWallet = function() { var fc = profileService.focusedClient; - var walletName = fc.credentials.walletName; + var name = fc.credentials.walletName; + var walletName = (fc.alias||'') + ' [' + name + ']'; var self = this; profileService.deleteWalletFC({}, function(err) { if (err) { self.error = err.message || err; } else { - notification.success(gettext('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName})); + notification.success(gettext('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: name})); } }); }; diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js new file mode 100644 index 000000000..dbdc02158 --- /dev/null +++ b/src/js/controllers/preferencesEmail.js @@ -0,0 +1,16 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesEmailController', + function($scope, go, profileService, gettext, $log) { + this.save = function(form) { + var self = this; + this.error = null; + + var fc = profileService.focusedClient; + this.saving = true; + $scope.$emit('Local/EmailSettingUpdated', self.email, function() { + self.saving = false; + go.path('preferences'); + }); + }; + }); diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js new file mode 100644 index 000000000..dde8e565b --- /dev/null +++ b/src/js/controllers/preferencesFee.js @@ -0,0 +1,38 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesFeeController', + function($rootScope, $scope, configService, go, gettext) { + var config = configService.getSync(); + this.feeName = config.wallet.settings.feeName || 'Priority'; + this.feeOpts = [{ + name: gettext('Priority'), + value: 100, + }, { + name: gettext('Normal'), + value: 50, + }, { + name: gettext('Economy'), + value: 10, + }, { + name: gettext('Emergency'), + red: true, + value: 500, + }, ]; + + this.save = function(newFee) { + var opts = { + wallet: { + settings: { + feeName: newFee.name, + feeValue: newFee.value * 100, + } + } + }; + this.feeName = newFee.name; + + configService.set(opts, function(err) { + if (err) console.log(err); + }); + + }; + }); diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js index 6eedd917f..f966abcc5 100644 --- a/src/js/controllers/preferencesLanguage.js +++ b/src/js/controllers/preferencesLanguage.js @@ -1,12 +1,24 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesLanguageController', - function($scope, $timeout, go) { + function($scope, $log, $timeout, configService, go) { this.save = function(newLang) { - $scope.$emit('Local/DefaultLanguage', newLang); - $timeout(function() { - go.preferences(); - }, 100); + + var opts = { + wallet: { + settings: { + defaultLanguage: newLang + } + } + }; + + configService.set(opts, function(err) { + if (err) $log.warn(err); + $scope.$emit('Local/LanguageSettingUpdated'); + $timeout(function() { + go.preferences(); + }, 100); + }); }; }); diff --git a/src/js/controllers/preferencesUnit.js b/src/js/controllers/preferencesUnit.js index 23821e8f1..7df745976 100644 --- a/src/js/controllers/preferencesUnit.js +++ b/src/js/controllers/preferencesUnit.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesUnitController', - function($rootScope, $scope, configService, go) { + function($rootScope, $scope, $log, configService, go) { var config = configService.getSync(); this.unitName = config.wallet.settings.unitName; this.unitOpts = [ @@ -51,8 +51,9 @@ angular.module('copayApp.controllers').controller('preferencesUnitController', this.unitName = newUnit.shortName; configService.set(opts, function(err) { - if (err) console.log(err); + if (err) $log.warn(err); $scope.$emit('Local/UnitSettingUpdated'); + go.preferences(); }); }; diff --git a/src/js/controllers/sidebar.js b/src/js/controllers/sidebar.js index a514fcefd..1e409792e 100644 --- a/src/js/controllers/sidebar.js +++ b/src/js/controllers/sidebar.js @@ -15,13 +15,19 @@ angular.module('copayApp.controllers').controller('sidebarController', self.setWallets(); }); + $rootScope.$on('Local/AliasUpdated', function(event) { + self.setWallets(); + }); + + self.signout = function() { profileService.signout(); }; - self.switchWallet = function(wid) { + self.switchWallet = function(selectedWalletId, currentWalletId) { + if (selectedWalletId == currentWalletId) return; self.walletSelection = false; - profileService.setAndStoreFocus(wid, function() { + profileService.setAndStoreFocus(selectedWalletId, function() { }); }; @@ -35,16 +41,17 @@ angular.module('copayApp.controllers').controller('sidebarController', if (!profileService.profile) return; var config = configService.getSync(); config.colorFor = config.colorFor || {}; + config.aliasFor = config.aliasFor || {}; var ret = lodash.map(profileService.profile.credentials, function(c) { return { m: c.m, n: c.n, - name: c.walletName, + name: config.aliasFor[c.walletId] || c.walletName, id: c.walletId, - color: config.colorFor[c.walletId] || '#7A8C9E', + color: config.colorFor[c.walletId] || '#4A90E2', }; }); - self.wallets = lodash.sortBy(ret, 'walletName'); + self.wallets = lodash.sortBy(ret, 'name'); }; self.setWallets(); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index ad05b33bc..a50009ff6 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog) { +angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService) { var self = this; $rootScope.hideMenuBar = false; @@ -23,7 +23,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.isRateAvailable = false; this.showScanner = false; this.isMobile = isMobile.any(); - this.addr = null; + this.addr = {}; var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) { self.setForm(data); @@ -38,26 +38,19 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); var disableAddrListener = $rootScope.$on('Local/NeedNewAddress', function() { - self.setNewAddress(); + self.setAddress(true); }); var disableFocusListener = $rootScope.$on('Local/NewFocusedWallet', function() { - self.addr = null; + self.addr = {}; self.resetForm(); }); - var disableOnlineListener = $rootScope.$on('Local/Online', function() { - // This is needed then the apps go to sleep - self.bindTouchDown(); - }); - var disableResumeListener = $rootScope.$on('Local/Resume', function() { // This is needed then the apps go to sleep self.bindTouchDown(); }); - - var disableTabListener = $rootScope.$on('Local/TabChanged', function(e, tab) { // This will slow down switch, do not add things here! switch (tab) { @@ -77,7 +70,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi disableTabListener(); disableFocusListener(); disableResumeListener(); - disableOnlineListener(); $rootScope.hideMenuBar = false; }); @@ -90,11 +82,15 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var parseError = function(err) { + if (!err) return; + if (err.message) { - if (err.message.indexOf('CORS')>=0) { + // TODO : this is not used anymore? + if (err.message.indexOf('CORS') >= 0) { err.message = gettext('Could not connect wallet service. Check your Internet connexion and your wallet service configuration.'); } - if (err.message.indexOf('TIMEDOUT')>=0) { + + if (err.message.indexOf('TIMEDOUT') >= 0) { err.message = gettext('Wallet service timed out. Check your Internet connexion and your wallet service configuration.'); } } @@ -123,17 +119,66 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); }; + + $scope.openWalletsModal = function(wallets) { + + var ModalInstanceCtrl = function($scope, $modalInstance) { + $scope.wallets = wallets; + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + + $scope.selectWallet = function(walletId, walletName) { + $scope.gettingAddress = true; + $scope.selectedWalletName = walletName; + $timeout(function() { + $scope.$apply(); + }); + addressService.getAddress(walletId, false, function(err, addr) { + $scope.gettingAddress = false; + if (!err || addr) + $modalInstance.close(addr); + else { + parseError(err); + self.error = err; + $modalInstance.dismiss('cancel'); + } + }); + }; + }; + + var modalInstance = $modal.open({ + templateUrl: 'views/modals/wallets.html', + windowClass: 'full animated slideInUp', + controller: ModalInstanceCtrl, + }); + + modalInstance.result.finally(function() { + var m = angular.element(document.getElementsByClassName('reveal-modal')); + m.addClass('slideOutDown'); + }); + + modalInstance.result.then(function(addr) { + if (addr) { + self.setForm(addr); + } + }); + }; + this.openTxpModal = function(tx, copayers) { var fc = profileService.focusedClient; + var refreshUntilItChanges = false; var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.error = null; $scope.tx = tx; $scope.amountStr = tx.amountStr; + $scope.feeStr = tx.feeStr; $scope.alternativeAmountStr = tx.alternativeAmountStr; $scope.copayers = copayers $scope.copayerId = fc.credentials.copayerId; $scope.loading = null; $scope.color = fc.backgroundColor; + refreshUntilItChanges = false; $scope.getShortNetworkName = function() { return fc.credentials.networkName.substring(0, 4); @@ -146,7 +191,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (err.code && err.code == 'BADREQUEST' && (eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) { $scope.tx.removed = true; - $scope.tx.couldRemove = false; + $scope.tx.canBeRemoved = false; $scope.tx.pendingForUs = false; $scope.$apply(); return; @@ -190,7 +235,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return; }; - self.setOngoingProcess(gettext('Signing transaction')); + self.setOngoingProcess(gettext('Signing payment')); $scope.loading = true; $scope.error = null; $timeout(function() { @@ -200,7 +245,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (err) { $scope.loading = false; parseError(err); - $scope.error = err.message || gettext('Could not sign transaction. Please try again.'); + $scope.error = err.message || gettext('Could not accept payment. Check you connection and try again'); $scope.$digest(); } else { //if txp has required signatures then broadcast it @@ -208,14 +253,19 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (txpHasRequiredSignatures) { self.setOngoingProcess(gettext('Broadcasting transaction')); $scope.loading = true; - fc.broadcastTxProposal(txpsi, function(err, txpsb) { + fc.broadcastTxProposal(txpsi, function(err, txpsb, memo) { self.setOngoingProcess(); $scope.loading = false; if (err) { parseError(err); - $scope.error = gettext('Could not broadcast transaction. Please try again.'); + $scope.error = gettext('Could not broadcast payment. Check you connection and try again'); $scope.$digest(); } else { + $log.debug('Transaction signed and broadcasted') + if (memo) + $log.info(memo); + + refreshUntilItChanges = true; $modalInstance.close(txpsb); } }); @@ -229,7 +279,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; $scope.reject = function(txp) { - self.setOngoingProcess(gettext('Rejecting transaction')); + self.setOngoingProcess(gettext('Rejecting payment')); $scope.loading = true; $scope.error = null; $timeout(function() { @@ -238,7 +288,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.loading = false; if (err) { parseError(err); - $scope.error = err.message || gettext('Could not reject transaction. Please try again.'); + $scope.error = err.message || gettext('Could not reject payment. Check you connection and try again'); $scope.$digest(); } else { $modalInstance.close(txpr); @@ -249,7 +299,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.remove = function(txp) { - self.setOngoingProcess(gettext('Deleting transaction')); + self.setOngoingProcess(gettext('Deleting payment')); $scope.loading = true; $scope.error = null; $timeout(function() { @@ -260,7 +310,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi // Hacky: request tries to parse an empty response if (err && !(err.message && err.message.match(/Unexpected/))) { parseError(err); - $scope.error = err.message || gettext('Could not delete transaction. Please try again.'); + $scope.error = err.message || gettext('Could not delete payment proposal. Check you connection and try again'); $scope.$digest(); return; } @@ -270,18 +320,23 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; $scope.broadcast = function(txp) { - self.setOngoingProcess(gettext('Broadcasting transaction')); + self.setOngoingProcess(gettext('Broadcasting Payment')); $scope.loading = true; $scope.error = null; $timeout(function() { - fc.broadcastTxProposal(txp, function(err, txpb) { + fc.broadcastTxProposal(txp, function(err, txpb, memo) { self.setOngoingProcess(); $scope.loading = false; if (err) { parseError(err); - $scope.error = err.message || gettext('Could not send transaction. Please try again.'); + $scope.error = err.message || gettext('Could not broadcast payment. Check you connection and try again'); $scope.$digest(); } else { + + if (memo) + $log.info(memo); + + refreshUntilItChanges = true; $modalInstance.close(txpb); } }); @@ -313,69 +368,52 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); if (txp) { txStatus.notify(txp, function() { - $scope.$emit('Local/TxProposalAction'); + $scope.$emit('Local/TxProposalAction', refreshUntilItChanges); }); } else { $timeout(function() { - $scope.$emit('Local/TxProposalAction'); + $scope.$emit('Local/TxProposalAction', refreshUntilItChanges); }, 100); } }); }; - // Receive - this.setNewAddress = function() { - var fc = profileService.focusedClient; - self.generatingAddress = true; - fc.createAddress(function(err, addr) { - self.generatingAddress = false; - if (err) { - if (err.error.match(/locked/gi)) { - $log.debug(err.error); - $timeout(function() { - self.setNewAddress(); - }, 5000); - } else { - $log.debug('Creating address ERROR:', err); - $scope.$emit('Local/ClientError', err); - $scope.$digest(); - } - return; - } - self.addr = addr.address; - storageService.storeLastAddress(fc.credentials.walletId, addr.address, function() { - - self.generatingAddress = false; - $scope.$digest(); - }); - }); - }; - - this.setAddress = function() { - if (self.addr) - return; - + this.setAddress = function(forceNew) { + self.addrError = null; var fc = profileService.focusedClient; if (!fc) return; + // Address already set? + if (!forceNew && self.addr[fc.credentials.walletId]) { + return; + } + + self.generatingAddress = true; $timeout(function() { - storageService.getLastAddress(fc.credentials.walletId, function(err, addr) { - if (addr) { - self.addr = addr; - $scope.$digest(); - } else { - self.setNewAddress(); + addressService.getAddress(fc.credentials.walletId, forceNew, function(err, addr) { + self.generatingAddress = false; + + if (err) { + parseError(err); + self.addrError = err.message || gettext('Could not create address. Check you connection and try again'); } + + if (addr) + self.addr[fc.credentials.walletId] = addr; + + $scope.$digest(); }); }); }; this.copyAddress = function(addr) { if (isCordova) { - window.cordova.plugins.clipboard.copy('bitcoin:' + addr); + window.cordova.plugins.clipboard.copy(addr); window.plugins.toast.showShortCenter('Copied to clipboard'); + } else if (nodeWebkit.isDefined()) { + nodeWebkit.writeToClipboard(addr); } }; @@ -388,6 +426,90 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } }; + this.openCustomizedAmountModal = function(addr) { + var self = this; + var fc = profileService.focusedClient; + var ModalInstanceCtrl = function($scope, $modalInstance) { + $scope.addr = addr; + $scope.color = fc.backgroundColor; + $scope.unitName = self.unitName; + $scope.alternativeAmount = self.alternativeAmount; + $scope.alternativeName = self.alternativeName; + $scope.alternativeIsoCode = self.alternativeIsoCode; + $scope.isRateAvailable = self.isRateAvailable; + $scope.unitToSatoshi = self.unitToSatoshi; + $scope.unitDecimals = self.unitDecimals; + var satToUnit = 1 / self.unitToSatoshi; + $scope.showAlternative = false; + + Object.defineProperty($scope, + "_customAlternative", { + get: function() { + return $scope.customAlternative; + }, + set: function(newValue) { + $scope.customAlternative = newValue; + if (typeof(newValue) === 'number' && $scope.isRateAvailable) { + $scope.customAmount = parseFloat((rateService.fromFiat(newValue, $scope.alternativeIsoCode) * satToUnit).toFixed($scope.unitDecimals), 10); + } + }, + enumerable: true, + configurable: true + }); + + Object.defineProperty($scope, + "_customAmount", { + get: function() { + return $scope.customAmount; + }, + set: function(newValue) { + $scope.customAmount = newValue; + if (typeof(newValue) === 'number' && $scope.isRateAvailable) { + $scope.customAlternative = parseFloat((rateService.toFiat(newValue * $scope.unitToSatoshi, $scope.alternativeIsoCode)).toFixed(2), 10); + } else { + $scope.customAlternative = 0; + } + $scope.alternativeAmount = $scope.customAlternative; + }, + enumerable: true, + configurable: true + }); + + $scope.submitForm = function(form) { + var satToBtc = 1 / 100000000; + var amount = form.amount.$modelValue; + var amountSat = parseInt((amount * $scope.unitToSatoshi).toFixed(0)); + $timeout(function() { + $scope.customizedAmountUnit = amount + ' ' + $scope.unitName; + $scope.customizedAlternativeUnit = $filter('noFractionNumber')(form.alternative.$modelValue, 2) + ' ' + $scope.alternativeIsoCode; + if ($scope.unitName == 'bits') { + amount = (amountSat * satToBtc).toFixed(8); + } + $scope.customizedAmountBtc = amount; + }, 1); + }; + + $scope.toggleAlternative = function() { + $scope.showAlternative = !$scope.showAlternative; + }; + + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + }; + + var modalInstance = $modal.open({ + templateUrl: 'views/modals/customized-amount.html', + windowClass: 'full animated slideInUp', + controller: ModalInstanceCtrl, + }); + + modalInstance.result.finally(function() { + var m = angular.element(document.getElementsByClassName('reveal-modal')); + m.addClass('slideOutDown'); + }); + }; + // Send this.canShowAlternative = function() { @@ -520,9 +642,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var fc = profileService.focusedClient; $log.warn(err); parseError(err); - var errMessage = 'The transaction' + (fc.credentials.m > 1 ? ' proposal' : '') + + var errMessage = + fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment'); - ' could not be created: ' + (err.message ? err.message : err); + //This are abnormal situations, but still err message will not be translated + //(the should) we should switch using err.code and use proper gettext messages + errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check you connection and try again')); this.error = errMessage; @@ -554,6 +679,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.submitForm = function() { var fc = profileService.focusedClient; var unitToSat = this.unitToSatoshi; + + if (isCordova && this.isWindowsPhoneApp) { + this.hideAddress = false; + this.hideAmount = false; + } var form = $scope.sendForm; if (form.$invalid) { @@ -583,6 +713,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi amount: amount, message: comment, payProUrl: paypro ? paypro.url : null, + feePerKb: config.feeValue || 10000, }, function(err, txp) { if (err) { self.setOngoingProcess(); @@ -591,12 +722,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } self.signAndBroadcast(txp, function(err) { - if (err) { - self.setOngoingProcess(); - return self.setSendError(err); - } - + self.setOngoingProcess(); + profileService.lockFC(); self.resetForm(); + if (err) { + self.error = err.message ? err.message : gettext('The payment was created but could not be completed. Please try again from home screen'); + $scope.$emit('Local/TxProposalAction'); + $timeout(function() { + $scope.$digest(); + }, 1); + } }); }); }, 100); @@ -608,23 +743,26 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(gettext('Signing transaction')); fc.signTxProposal(txp, function(err, signedTx) { profileService.lockFC(); - + self.setOngoingProcess(); if (err) { - self.setOngoingProcess(); + $log.debug('Sign error:', err); + err.message = gettext('The payment was created but could not be signed. Please try again from home screen.') + (err.message ? ' ' + err.message : ''); return cb(err); } if (signedTx.status == 'accepted') { self.setOngoingProcess(gettext('Broadcasting transaction')); - fc.broadcastTxProposal(signedTx, function(err, btx) { + fc.broadcastTxProposal(signedTx, function(err, btx, memo) { self.setOngoingProcess(); if (err) { - $scope.error = gettext('Transaction not broadcasted. Please try again.'); - $scope.$digest(); + err.message = gettext('The payment was signed but could not be broadcasted. Please try again from home screen.') + (err.message ? ' ' + err.message : ''); return cb(err); } + if (memo) + $log.info(memo); + txStatus.notify(btx, function() { - $scope.$emit('Local/TxProposalAction'); + $scope.$emit('Local/TxProposalAction', true); return cb(); }); }); @@ -821,22 +959,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return this.alternativeIsoCode; }; - this._addRates = function(txs, cb) { - if (!txs || txs.length == 0) return cb(); - var index = lodash.groupBy(txs, 'rateTs'); - - rateService.getHistoricRates(config.alternativeIsoCode, lodash.keys(index), function(err, res) { - if (err || !res) return cb(err); - lodash.each(res, function(r) { - lodash.each(index[r.ts], function(tx) { - var alternativeAmount = (r.rate != null ? tx.amount * rateService.SAT_TO_BTC * r.rate : null); - tx.alternativeAmount = alternativeAmount ? $filter('noFractionNumber')(alternativeAmount, 2) : null; - }); - }); - return cb(); - }); - }; - this.openTxModal = function(btx) { var self = this; var fc = profileService.focusedClient; @@ -886,6 +1008,46 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return actions.hasOwnProperty('create'); }; + this._doSendAll = function(amount) { + this.setForm(null, amount); + }; + + this.confirmDialog = function(msg, cb) { + if (isCordova) { + navigator.notification.confirm( + msg, + function(buttonIndex) { + if (buttonIndex == 1) { + $timeout(function() { + return cb(true); + }, 1); + } else { + return cb(false); + } + } + ); + } else if (isChromeApp) { + // No feedback, alert/confirm not supported. + return cb(true); + } else { + return cb(confirm(msg)); + } + }; + + this.sendAll = function(amount, feeStr) { + var self = this; + var msg = gettextCatalog.getString("{{fee}} will be discounted for bitcoin networking fees", { + fee: feeStr + }); + + this.confirmDialog(msg, function(confirmed){ + if (confirmed) + self._doSendAll(amount); + }); + }; + + /* Start setup */ + this.bindTouchDown(); this.setAddress(); this.setSendFormInputs(); diff --git a/src/js/init.js b/src/js/init.js index 8cacff9a5..81673661e 100644 --- a/src/js/init.js +++ b/src/js/init.js @@ -6,6 +6,15 @@ angular.element(document).ready(function() { var startAngular = function() { angular.bootstrap(document, ['copayApp']); }; + + var handleBitcoinURI = function(url) { + if (!url) return; + setTimeout(function() { + window.location = '#/uri-payment/' + url; + }, 1000); + }; + + /* Cordova specific Init */ if (window.cordova !== undefined) { @@ -26,20 +35,13 @@ angular.element(document).ready(function() { }, 100); }, false); - // We are not emitting here, since when the BWS socket reconnects, - // update will be triggered - document.addEventListener('offline', function() { - window.location = '#/cordova/offline'; - }, false); - // Back button event document.addEventListener('backbutton', function() { var loc = window.location; if (loc.toString().match(/index\.html#\/$/)) { - navigator.app.exitApp(); - } - else { - window.location = '#/walletHome'; + navigator.app.exitApp(); + } else { + window.location = '#/cordova/walletHome'; } }, false); @@ -53,13 +55,6 @@ angular.element(document).ready(function() { navigator.splashscreen.hide(); }, 2000); - function handleBitcoinURI(url) { - if (!url) return; - setTimeout(function() { - window.location = '#/uri-payment/' + url; - }, 1000); - } - window.plugins.webintent.getUri(handleBitcoinURI); window.plugins.webintent.onNewIntent(handleBitcoinURI); window.handleOpenURL = handleBitcoinURI; @@ -67,6 +62,13 @@ angular.element(document).ready(function() { startAngular(); }, false); } else { + + try { + window.handleOpenURL = handleBitcoinURI; + window.plugins.webintent.getUri(handleBitcoinURI); + window.plugins.webintent.onNewIntent(handleBitcoinURI); + } catch (e) {} + startAngular(); } diff --git a/src/js/routes.js b/src/js/routes.js index e0ebe98a3..8d056f72e 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -27,6 +27,10 @@ angular ['debug', 'info', 'warn', 'error', 'log'].forEach(function(level) { var orig = $delegate[level]; $delegate[level] = function() { + + if (level == 'error') + console.log(arguments); + var args = [].slice.call(arguments); if (!Array.isArray(args)) args = [args]; args = args.map(function(v) { @@ -39,9 +43,13 @@ angular else v = JSON.stringify(v); } - v = v.toString(); - if (v.length > 200) - v = v.substr(0, 197) + '...'; + // Trim output in mobile + if ( window.cordova ) { + v = v.toString(); + if (v.length > 1000) { + v = v.substr(0, 997) + '...'; + } + } } catch (e) { console.log('Error at log decorator:', e); v = 'undefined'; @@ -54,7 +62,7 @@ angular historicLog.add(level, args.join(' ')); orig.apply(null, args); } catch (e) { - console.log('Error at log decorator:', e); + console.log('ERROR (at log decorator):', e, args[0]); } }; }); @@ -69,15 +77,21 @@ angular views: { 'main': { templateUrl: 'views/splash.html', - controller: function($scope, $timeout, $log, profileService, go) { - if (profileService.profile) { - go.walletHome(); - } + controller: function($scope, $timeout, $log, profileService, storageService, go) { + storageService.getCopayDisclaimerFlag(function(err, val) { + if (!val) go.path('disclaimer'); + + if (profileService.profile) { + go.walletHome(); + } + }); $scope.create = function(noWallet) { $scope.creatingProfile = true; - profileService.create({noWallet: noWallet}, function(err) { + profileService.create({ + noWallet: noWallet + }, function(err) { if (err) { $scope.creatingProfile = false; $log.warn(err); @@ -92,6 +106,33 @@ angular } } } + }); + + $stateProvider + .state('disclaimer', { + url: '/disclaimer', + needProfile: false, + views: { + 'main': { + templateUrl: 'views/disclaimer.html', + controller: function($scope, $timeout, storageService, applicationService, go) { + storageService.getCopayDisclaimerFlag(function(err, val) { + $scope.agreed = val; + $timeout(function() { + $scope.$digest(); + }, 1); + }); + + $scope.agree = function() { + storageService.setCopayDisclaimerFlag(function(err) { + $timeout(function() { + applicationService.restart(); + }, 1000); + }); + }; + } + } + } }) .state('walletHome', { url: '/', @@ -112,7 +153,7 @@ angular } } }) - .state('uri-payment', { + .state('payment', { url: '/uri-payment/:data', templateUrl: 'views/paymentUri.html', views: { @@ -211,7 +252,19 @@ angular }, } }) - .state('preferencesAdvanced', { + .state('preferencesFee', { + url: '/preferencesFee', + templateUrl: 'views/preferencesFee.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesFee.html' + }, + } + }) + + .state('preferencesAdvanced', { url: '/preferencesAdvanced', templateUrl: 'views/preferencesAdvanced.html', walletShouldBeComplete: true, @@ -245,6 +298,30 @@ angular }, } }) + .state('preferencesAlias', { + url: '/preferencesAlias', + templateUrl: 'views/preferencesAlias.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesAlias.html' + }, + + } + }) + .state('preferencesEmail', { + url: '/preferencesEmail', + templateUrl: 'views/preferencesEmail.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesEmail.html' + }, + + } + }) .state('preferencesBwsUrl', { url: '/preferencesBwsUrl', templateUrl: 'views/preferencesBwsUrl.html', @@ -327,15 +404,15 @@ angular url: '/cordova/:status', views: { 'main': { - controller: function($rootScope, $stateParams, go) { + controller: function($rootScope, $stateParams, $timeout, go) { switch ($stateParams.status) { case 'resume': $rootScope.$emit('Local/Resume'); break; - case 'offline': - $rootScope.$emit('Local/Offline'); - break; }; + $timeout(function() { + $rootScope.$emit('Local/SetTab', 'walletHome', true); + }, 100); go.walletHome(); } } @@ -343,7 +420,7 @@ angular needProfile: false }); }) - .run(function($rootScope, $state, $log, gettextCatalog, uriHandler, isCordova, amMoment, profileService, $timeout) { + .run(function($rootScope, $state, $log, gettextCatalog, uriHandler, isCordova, amMoment, profileService, $timeout, nodeWebkit) { FastClick.attach(document.body); // Auto-detect browser language @@ -365,9 +442,25 @@ angular uriHandler.register(); } + if (nodeWebkit.isDefined()) { + var gui = require('nw.gui'); + var win = gui.Window.get(); + var nativeMenuBar = new gui.Menu({ + type: "menubar" + }); + try { + nativeMenuBar.createMacBuiltin("Copay"); + } catch (e) { + $log.debug('This is not OSX'); + } + win.menu = nativeMenuBar; + } + var pageWeight = { walletHome: 0, copayers: -1, + cordova: -1, + payment: -1, preferences: 11, preferencesColor: 12, @@ -376,10 +469,14 @@ angular delete: 13, preferencesLanguage: 12, preferencesUnit: 12, + preferencesFee: 12, preferencesAltCurrency: 12, preferencesBwsUrl: 12, + preferencesAlias: 12, + preferencesEmail: 12, about: 12, logs: 13, + disclaimer: 13, add: 11, create: 12, join: 12, @@ -404,6 +501,9 @@ angular if (err.message.match('NOPROFILE')) { $log.debug('No profile... redirecting'); $state.transitionTo('splash'); + } else if (err.message.match('NONAGREEDDISCLAIMER')) { + $log.debug('Display disclaimer... redirecting'); + $state.transitionTo('disclaimer'); } else { throw new Error(err); // TODO } @@ -425,7 +525,8 @@ angular */ function cleanUpLater(e, e2) { - var cleanedUp = false, timeoutID; + var cleanedUp = false, + timeoutID; var cleanUp = function() { if (cleanedUp) return; cleanedUp = true; @@ -435,7 +536,7 @@ angular cachedBackPanel = null; cachedTransitionState = ''; if (timeoutID) { - timeoutID=null; + timeoutID = null; window.clearTimeout(timeoutID); } }; @@ -443,7 +544,6 @@ angular e2.addEventListener("animationend", cleanUp, true); e.addEventListener("webkitAnimationEnd", cleanUp, true); e2.addEventListener("webkitAnimationEnd", cleanUp, true); - // TODO timeoutID = setTimeout(cleanUp, 500); }; @@ -461,7 +561,7 @@ angular var fromName = fromState.name; var toName = toState.name; - if (!fromName || !toName) + if (!fromName || !toName) return true; var fromWeight = pageWeight[fromName]; @@ -471,19 +571,27 @@ angular var entering = null, leaving = null; + // Horizontal Slide Animation? if (fromWeight && toWeight) { if (fromWeight > toWeight) { leaving = 'CslideOutRight'; } else { entering = 'CslideInRight'; } + + // Vertical Slide Animation? } else if (fromName && fromWeight >= 0 && toWeight >= 0) { if (toWeight) { entering = 'CslideInUp'; } else { leaving = 'CslideOutDown'; } + + // no Animation ? + } else { + return true; } + var e = document.getElementById('mainSection'); @@ -493,13 +601,13 @@ angular e.className = entering || ''; cachedBackPanel.className = leaving || ''; cleanUpLater(e, cachedBackPanel); - console.log('USing', cachedTransitionState); //TODO + //console.log('USing animation', cachedTransitionState); return true; } else { var sc; // Keep prefDiv scroll - var contentDiv = e.getElementsByClassName('content'); - if (contentDiv && contentDiv[0]) + var contentDiv = e.getElementsByClassName('content'); + if (contentDiv && contentDiv[0]) sc = contentDiv[0].scrollTop; cachedBackPanel = e.cloneNode(true); @@ -508,10 +616,10 @@ angular c.appendChild(cachedBackPanel); if (sc) - cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc; + cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc; cachedTransitionState = desiredTransitionState; - console.log('CACHing', cachedTransitionState); //TODO + //console.log('CACHing animation', cachedTransitionState); return false; } } diff --git a/src/js/services/addressService.js b/src/js/services/addressService.js new file mode 100644 index 000000000..39978f94a --- /dev/null +++ b/src/js/services/addressService.js @@ -0,0 +1,75 @@ +'use strict'; +'use strict'; +angular.module('copayApp.services') + .factory('addressService', function(storageService, profileService, $log, $timeout, lodash) { + var root = {}; + + + root.expireAddress = function(walletId,cb) { + $log.debug('Cleaning Address ' + walletId ); + storageService.clearLastAddress(walletId, function(err) { + return cb(err); + }); + }; + + root.isUsed = function(walletId, byAddress, cb) { + storageService.getLastAddress(walletId, function(err, addr) { + var used = lodash.find(byAddress, { + address: addr + }); + return cb(null, used); + }); + }; + + root._createAddress = function(walletId, cb) { + var client = profileService.getClient(walletId); + + $log.debug('Creating address for wallet:', walletId); + + client.createAddress(function(err, addr) { + if (err) { + if (err.error && err.error.match(/locked/gi)) { + $log.debug(err.error); + return $timeout(function() { + root._createAddress(walletId, cb); + }, 5000); + } + $log.debug('Creating address ERROR:', err); + return cb(err); + } + return cb(null, addr.address); + }); + }; + + root.getAddress = function(walletId, forceNew, cb) { + + var firstStep; + if (forceNew) { + firstStep = storageService.clearLastAddress; + } else { + firstStep = function(walletId, cb) { + return cb(); + }; + } + + firstStep(walletId, function(err) { + if (err) return cb(err); + + storageService.getLastAddress(walletId, function(err, addr) { + if (err) return cb(err); + + if (addr) return cb(null, addr); + + root._createAddress(walletId, function(err, addr) { + if (err) return cb(err); + storageService.storeLastAddress(walletId, addr, function() { + if (err) return cb(err); + return cb(null, addr); + }); + }); + }); + }); + }; + + return root; + }); diff --git a/src/js/services/applicationService.js b/src/js/services/applicationService.js index 1855a6d97..a694a86be 100644 --- a/src/js/services/applicationService.js +++ b/src/js/services/applicationService.js @@ -1,22 +1,30 @@ 'use strict'; angular.module('copayApp.services') - .factory('applicationService', function($rootScope, $timeout, isCordova, isChromeApp) { + .factory('applicationService', function($rootScope, $timeout, isCordova, isChromeApp, nodeWebkit, go) { var root = {}; - root.restart = function(hard) { + root.restart = function() { + var hashIndex = window.location.href.indexOf('#/'); if (isCordova) { - if (hard) { - location.reload(); - } + window.location = window.location.href.substr(0, hashIndex); $timeout(function() { $rootScope.$digest(); }, 1); } else { // Go home reloading the application - var hashIndex = window.location.href.indexOf('#/'); if (isChromeApp) { - chrome.runtime.reload(); + if (nodeWebkit.isDefined()) { + go.walletHome(); + $timeout(function() { + var win = require('nw.gui').Window.get(); + win.reload(3); + //or + win.reloadDev(); + }, 100); + } else { + chrome.runtime.reload(); + } } else { window.location = window.location.href.substr(0, hashIndex); } diff --git a/src/js/services/backupService.js b/src/js/services/backupService.js index c70232ba5..328e5fcd8 100644 --- a/src/js/services/backupService.js +++ b/src/js/services/backupService.js @@ -40,7 +40,7 @@ angular.module('copayApp.services') var a = document.createElement("a"); document.body.appendChild(a); - a.style = "display: none"; + a.style.display = "none"; var blob = new NewBlob(ew, 'text/plain;charset=utf-8'); var url = window.URL.createObjectURL(blob); @@ -75,7 +75,7 @@ angular.module('copayApp.services') var ew = root.walletExport(password); if (!ew) return cb('Could not create backup'); - var walletName = fc.credentials.walletName; + var walletName = (fc.alias || '') + (fc.alias ? '-' : '') + fc.credentials.walletName; var filename = walletName + '-Copaybackup.aes.json'; _download(ew, filename, cb) }; diff --git a/src/js/services/configService.js b/src/js/services/configService.js index 5666b56ae..07bdf38eb 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -57,6 +57,9 @@ angular.module('copayApp.services').factory('configService', function(storageSer if (!configCache.bws) { configCache.bws = defaultConfig.bws; } + if (!configCache.wallet) { + configCache.wallet = defaultConfig.wallet; + } if (!configCache.wallet.settings.unitCode) { configCache.wallet.settings.unitCode = defaultConfig.wallet.settings.unitCode; } diff --git a/src/js/services/go.js b/src/js/services/go.js index e3b75dc54..3e55e2939 100644 --- a/src/js/services/go.js +++ b/src/js/services/go.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('go', function($window, $rootScope, $location, $state, profileService) { +angular.module('copayApp.services').factory('go', function($window, $rootScope, $location, $state, profileService, nodeWebkit) { var root = {}; var hideSidebars = function() { @@ -30,13 +30,20 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope, }; root.openExternalLink = function(url) { - var ref = window.open(url, '_blank', 'location=no'); + if (nodeWebkit.isDefined()) { + nodeWebkit.openExternalLink(url); + } + else { + var ref = window.open(url, '_blank', 'location=no'); + } }; root.path = function(path, cb) { $state.transitionTo(path) .then(function() { if (cb) return cb(); + }, function() { + if (cb) return cb('animation in progress'); }); hideSidebars(); }; diff --git a/src/js/services/localStorage.js b/src/js/services/localStorage.js index 1d8c55b11..853677159 100644 --- a/src/js/services/localStorage.js +++ b/src/js/services/localStorage.js @@ -1,11 +1,11 @@ 'use strict'; angular.module('copayApp.services') - .factory('localStorageService', function(isChromeApp, $timeout) { + .factory('localStorageService', function(isChromeApp, nodeWebkit, $timeout) { var root = {}; var ls = ((typeof window.localStorage !== "undefined") ? window.localStorage : null); - if (isChromeApp && !ls) { + if (isChromeApp && !nodeWebkit.isDefined() && !ls) { ls = localStorage = chrome.storage.local; window.localStorage = chrome.storage.local; } @@ -14,7 +14,7 @@ angular.module('copayApp.services') throw new Error('localstorage not available'); root.get = function(k, cb) { - if (isChromeApp) { + if (isChromeApp && !nodeWebkit.isDefined()) { chrome.storage.local.get(k, function(data) { //TODO check for errors @@ -40,7 +40,7 @@ angular.module('copayApp.services') }; root.set = function(k, v, cb) { - if (isChromeApp) { + if (isChromeApp && !nodeWebkit.isDefined()) { var obj = {}; obj[k] = v; @@ -53,7 +53,7 @@ angular.module('copayApp.services') }; root.remove = function(k, cb) { - if (isChromeApp) { + if (isChromeApp && !nodeWebkit.isDefined()) { chrome.storage.local.remove(k, cb); } else { ls.removeItem(k); diff --git a/src/js/services/logHeader.js b/src/js/services/logHeader.js index 698c442a2..cec37bf5e 100644 --- a/src/js/services/logHeader.js +++ b/src/js/services/logHeader.js @@ -1,8 +1,8 @@ 'use strict'; angular.module('copayApp.services') - .factory('logHeader', function($log, isChromeApp, isCordova) { + .factory('logHeader', function($log, isChromeApp, isCordova, nodeWebkit) { $log.info('Starting Copay v' + window.version + ' #' + window.commitHash); - $log.info('Client: isCordova:', isCordova, 'isChromeApp:', isChromeApp); + $log.info('Client: isCordova:', isCordova, 'isChromeApp:', isChromeApp, 'isNodeWebkit:', nodeWebkit.isDefined()); $log.info('Navigator:', navigator.userAgent); return {}; }); diff --git a/src/js/services/nodeWebkit.js b/src/js/services/nodeWebkit.js new file mode 100644 index 000000000..580d502eb --- /dev/null +++ b/src/js/services/nodeWebkit.js @@ -0,0 +1,42 @@ +'use strict'; + +angular.module('copayApp.services').factory('nodeWebkit', function nodeWebkitFactory() { + var root = {}; + + var isNodeWebkit = function() { + var isNode = (typeof process !== "undefined" && typeof require !== "undefined"); + if(isNode) { + try { + return (typeof require('nw.gui') !== "undefined"); + } catch(e) { + return false; + } + } + }; + + root.isDefined = function() { + return isNodeWebkit(); + }; + + root.readFromClipboard = function() { + if (!isNodeWebkit()) return; + var gui = require('nw.gui'); + var clipboard = gui.Clipboard.get(); + return clipboard.get(); + }; + + root.writeToClipboard = function(text) { + if (!isNodeWebkit()) return; + var gui = require('nw.gui'); + var clipboard = gui.Clipboard.get(); + return clipboard.set(text); + }; + + root.openExternalLink = function(url) { + if (!isNodeWebkit()) return; + var gui = require('nw.gui'); + return gui.Shell.openExternal(url); + }; + + return root; +}); diff --git a/src/js/services/notificationsService.js b/src/js/services/notificationsService.js index d34ed6858..029d2d2ca 100644 --- a/src/js/services/notificationsService.js +++ b/src/js/services/notificationsService.js @@ -4,7 +4,7 @@ angular.module('copayApp.services') var root = {}; - var groupingTime = 4000; + var groupingTime = 5000; var lastNotificationOnWallet = {}; root.getLast = function(walletId) { @@ -15,6 +15,10 @@ angular.module('copayApp.services') }; root.storeLast = function(notificationData, walletId) { + + if (notificationData.type == 'NewAddress') + return; + lastNotificationOnWallet[walletId] = { creatorId: notificationData.creatorId, type: notificationData.type, @@ -38,7 +42,6 @@ angular.module('copayApp.services') && notificationData.type === 'TxProposalFinallyRejected') return true; - return false; }; @@ -52,36 +55,37 @@ angular.module('copayApp.services') var config = configService.getSync(); config.colorFor = config.colorFor || {}; - var color = config.colorFor[walletId] || '#2C3E50'; + var color = config.colorFor[walletId] || '#7A8C9E'; + var name = config.aliasFor[walletId] || walletName; switch (notificationData.type) { case 'NewTxProposal': - notification.new(gettext('New Transaction'), - walletName, {color: color} ); + notification.new(gettext('New Payment Proposal'), + name, {color: color} ); break; case 'TxProposalAcceptedBy': - notification.success(gettext('Transaction Signed'), - walletName, {color: color} ); + notification.success(gettext('Payment Proposal Signed by Copayer'), + name, {color: color} ); break; case 'TxProposalRejectedBy': - notification.error(gettext('Transaction Rejected'), - walletName, {color: color} ); + notification.error(gettext('Payment Proposal Rejected by Copayer'), + name, {color: color} ); break; case 'TxProposalFinallyRejected': - notification.error(gettext('A transaction was finally rejected'), - walletName, {color: color} ); + notification.error(gettext('Payment Proposal Rejected'), + name, {color: color} ); break; case 'NewOutgoingTx': - notification.sent(gettext('Transaction Sent'), - walletName, {color: color} ); + notification.sent(gettext('Payment Sent'), + name, {color: color} ); break; case 'NewIncomingTx': notification.funds(gettext('Funds received'), - walletName, {color: color} ); + name, {color: color} ); break; case 'ScanFinished': notification.success(gettext('Scan Finished'), - walletName, {color: color} ); + name, {color: color} ); break; case 'NewCopayer': diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index e2d85d1ce..e16408c45 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -1,6 +1,6 @@ 'use strict'; angular.module('copayApp.services') - .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext) { + .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit) { var root = {}; @@ -24,18 +24,19 @@ angular.module('copayApp.services') $log.debug('Set focus:', walletId); // Set local object - root.focusedClient = root.walletClients[walletId]; + if (walletId) + root.focusedClient = root.walletClients[walletId]; + else + root.focusedClient = []; if (lodash.isEmpty(root.focusedClient)) { root.focusedClient = root.walletClients[lodash.keys(root.walletClients)[0]]; } + // Still nothing? if (lodash.isEmpty(root.focusedClient)) { $rootScope.$emit('Local/NoWallets'); - } - - // set if completed - if (!lodash.isEmpty(root.focusedClient)) { + } else { $rootScope.$emit('Local/NewFocusedWallet'); } @@ -63,14 +64,14 @@ angular.module('copayApp.services') client.on('reconnect', function() { if (root.focusedClient.credentials.walletId == client.credentials.walletId) { - $rootScope.$emit('Local/Online'); + $log.debug('### Online'); } }); client.on('reconnecting', function() { if (root.focusedClient.credentials.walletId == client.credentials.walletId) { - $rootScope.$emit('Local/Offline'); + $log.debug('### Offline'); } }); @@ -124,36 +125,44 @@ angular.module('copayApp.services') $log.debug('Preferences read'); if (err) return cb(err); root.applyConfig(); - $rootScope.$emit('Local/DefaultLanguage'); root.setWalletClients(); storageService.getFocusedWalletId(function(err, focusedWalletId) { if (err) return cb(err); - root._setFocus(focusedWalletId, cb); + root._setFocus(focusedWalletId, function() { + $rootScope.$emit('Local/ProfileBound'); + return cb(); + }); }); }); }; root.loadAndBindProfile = function(cb) { - storageService.getProfile(function(err, profile) { - if (err) { - $rootScope.$emit('Local/DeviceError', err); - return cb(err); - } - if (!profile) { - // Migration?? - storageService.tryToMigrate(function(err, migratedProfile) { - if (err) return cb(err); - if (!migratedProfile) - return cb(new Error('NOPROFILE: No profile')); - - profile = migratedProfile; - return root.bindProfile(profile, cb); - }) + storageService.getCopayDisclaimerFlag(function(err, val) { + if (!val) { + return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer')); } else { - $log.debug('Profile read'); - return root.bindProfile(profile, cb); - } + storageService.getProfile(function(err, profile) { + if (err) { + $rootScope.$emit('Local/DeviceError', err); + return cb(err); + } + if (!profile) { + // Migration?? + storageService.tryToMigrate(function(err, migratedProfile) { + if (err) return cb(err); + if (!migratedProfile) + return cb(new Error('NOPROFILE: No profile')); + profile = migratedProfile; + return root.bindProfile(profile, cb); + }) + } else { + $log.debug('Profile read'); + return root.bindProfile(profile, cb); + } + + }); + } }); }; @@ -226,6 +235,11 @@ angular.module('copayApp.services') }) }; + + root.getClient = function(walletId) { + return root.walletClients[walletId]; + }; + root.deleteWalletFC = function(opts, cb) { var fc = root.focusedClient; $log.debug('Deleting Wallet:', fc.credentials.walletName); @@ -371,13 +385,13 @@ angular.module('copayApp.services') $log.debug('Wallet is encrypted'); $rootScope.$emit('Local/NeedsPassword', false, function(err2, password) { if (err2 || !password) { - return cb(err2 || gettext('Password needed')); + return cb({message: (err2 || gettext('Password needed'))}); } try { fc.unlock(password); } catch (e) { $log.debug(e); - return cb(gettext('Wrong password')); + return cb({message: gettext('Wrong password')}); } $timeout(function() { if (fc.isPrivKeyEncrypted()) { @@ -389,6 +403,29 @@ angular.module('copayApp.services') }); }; + root.getWallets = function(network) { + if (!root.profile) return []; + + var config = configService.getSync(); + config.colorFor = config.colorFor || {}; + config.aliasFor = config.aliasFor || {}; + var ret = lodash.map(root.profile.credentials, function(c) { + return { + m: c.m, + n: c.n, + name: config.aliasFor[c.walletId] || c.walletName, + id: c.walletId, + network: c.network, + color: config.colorFor[c.walletId] || '#2C3E50' + }; + }); + ret = lodash.filter(ret, function(w) { + return (w.network == network); + }); + return lodash.sortBy(ret, 'name'); + }; + + return root; }); diff --git a/src/js/services/rateService.js b/src/js/services/rateService.js index 32a105c64..be7f2e6ee 100644 --- a/src/js/services/rateService.js +++ b/src/js/services/rateService.js @@ -45,7 +45,7 @@ RateService.prototype._fetchCurrencies = function() { var self = this; var backoffSeconds = 5; - var updateFrequencySeconds = 3600; + var updateFrequencySeconds = 5 * 60; var rateServiceUrl = 'https://bitpay.com/api/rates'; var retrieve = function() { diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index 47b213ae2..1916ec032 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -124,7 +124,7 @@ angular.module('copayApp.services') }; root.storeFocusedWalletId = function(id, cb) { - storage.set('focusedWalletId', id, cb); + storage.set('focusedWalletId', id||'', cb); }; root.getFocusedWalletId = function(cb) { @@ -151,6 +151,18 @@ angular.module('copayApp.services') storage.get('backup-' + walletId, cb); }; + root.setCleanAndScanAddresses = function(cb) { + storage.set('CleanAndScanAddresses', Date.now(), cb); + }; + + root.getCleanAndScanAddresses = function(cb) { + storage.get('CleanAndScanAddresses', cb); + }; + + root.removeCleanAndScanAddresses = function(cb) { + storage.remove('CleanAndScanAddresses', cb); + }; + root.getConfig = function(cb) { storage.get('config', cb); }; @@ -164,5 +176,21 @@ angular.module('copayApp.services') storage.remove('config', cb); }; + root.setCopayDisclaimerFlag = function(cb) { + storage.set('agreeDisclaimer', true, cb); + }; + + root.getCopayDisclaimerFlag = function(cb) { + storage.get('agreeDisclaimer', cb); + }; + + root.setRemotePrefsStoredFlag = function(cb) { + storage.set('remotePrefStored', true, cb); + }; + + root.getRemotePrefsStoredFlag = function(cb) { + storage.get('remotePrefStored', cb); + }; + return root; }); diff --git a/src/js/services/txStatus.js b/src/js/services/txStatus.js index f4e3cb92a..82ae358c4 100644 --- a/src/js/services/txStatus.js +++ b/src/js/services/txStatus.js @@ -5,31 +5,35 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash, root.notify = function(txp, cb) { var fc = profileService.focusedClient; - var msg; - var status = txp.status; + var type; if (status == 'broadcasted') { - msg = gettext('Transaction broadcasted'); + type = 'broadcasted'; } else { + + var n = txp.actions.length; var action = lodash.find(txp.actions, { copayerId: fc.credentials.copayerId }); - if (!action) { - msg = gettext('Transaction proposal created'); + + if (!action || (action.type == 'accept' && n == 1)) { + type = 'created'; } else if (action.type == 'accept') { - msg = gettext('Transaction proposal signed'); + type = 'accepted'; } else if (action.type == 'reject') { - msg = gettext('Transaction was rejected'); + type = 'rejected'; + } else { + throw new Error('Unknown type:' + type); } } - root.openModal(msg, cb); + root.openModal(type, cb); }; - root.openModal = function(statusStr, cb) { + root.openModal = function(type, cb) { var ModalInstanceCtrl = function($scope, $modalInstance) { - $scope.statusStr = statusStr; + $scope.type = type; $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; diff --git a/util/swipeWallet.js b/util/swipeWallet.js index 6613d464f..3dc542cf5 100755 --- a/util/swipeWallet.js +++ b/util/swipeWallet.js @@ -2,17 +2,19 @@ 'use strict'; +console.log('Swipe wallet is outdated, and it does not work with Copay 0.10.x'); +process.exit(1); -var copay = require('../copay'); var _ = require('lodash'); +var program = require('commander'); var config = require('../config'); var version = require('../version').version; var sinon = require('sinon'); var bitcore = require('bitcore'); var readline = require('readline'); var async = require('async'); -var program = require('commander'); +var copay = require('../copay'); function list(val) { return val.split(','); } diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop new file mode 100644 index 000000000..b3a3fec2d --- /dev/null +++ b/webkitbuilds/.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Version=1.0.1 +Name=Copay +Comment=A multisignature wallet +Exec=copay +Icon=favicon.ico +Terminal=false +Categories=Finance diff --git a/webkitbuilds/README.md b/webkitbuilds/README.md new file mode 100644 index 000000000..139597f9c --- /dev/null +++ b/webkitbuilds/README.md @@ -0,0 +1,2 @@ + + diff --git a/webkitbuilds/favicon.ico b/webkitbuilds/favicon.ico new file mode 100644 index 000000000..03f394e70 Binary files /dev/null and b/webkitbuilds/favicon.ico differ diff --git a/webkitbuilds/setup-win32.iss b/webkitbuilds/setup-win32.iss new file mode 100755 index 000000000..e08abcde4 --- /dev/null +++ b/webkitbuilds/setup-win32.iss @@ -0,0 +1,47 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "Copay" +#define MyAppVersion "1.1.1" +#define MyAppPublisher "BitPay" +#define MyAppURL "https://copay.io" +#define MyAppExeName "copay.exe" + +[Setup] +AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +OutputBaseFilename=copay-win32 +OutputDir=./ +Compression=lzma +SolidCompression=yes + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl" +Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "copay\win32\copay.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "copay\win32\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{app}"; IconFilename: "{app}/icon.ico" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}/icon.ico"; Tasks: desktopicon + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent + diff --git a/webkitbuilds/setup-win64.iss b/webkitbuilds/setup-win64.iss new file mode 100755 index 000000000..f6e4ddd1f --- /dev/null +++ b/webkitbuilds/setup-win64.iss @@ -0,0 +1,47 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "Copay" +#define MyAppVersion "1.1.1" +#define MyAppPublisher "BitPay" +#define MyAppURL "https://copay.io" +#define MyAppExeName "copay.exe" + +[Setup] +AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +OutputBaseFilename=copay-win64 +OutputDir=./ +Compression=lzma +SolidCompression=yes + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl" +Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "copay\win64\copay.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "copay\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{app}"; IconFilename: "{app}/icon.ico" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}/icon.ico"; Tasks: desktopicon + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent +