anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/wallet/task/439' into wallet/task/514

Browse source 
# Conflicts:
#	src/js/controllers/amount.js
This commit is contained in:
Sebastiaan Pasma 2018-08-01 11:16:59 +02:00
commit 5372ba3dac
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
18 changed files with 785 additions and 336 deletions
Download patch file Download diff file Expand all files Collapse all files

4
i18n/po/template.pot
View file

@ -3711,3 +3711,7 @@ msgstr ""
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr ""
#: src/js/controllers/amount.js:49
msgid "Address doesn\'t contain currency information, please make sure you are sending the correct currency."
msgstr ""