Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

update #1

Merged
merged 57 commits into from
May 9, 2018
Merged
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
b1f530e
new version number (#208)
m2049r Mar 13, 2018
a909249
changes for monero v0.12 (#214)
m2049r Mar 29, 2018
1c709da
Update FAQ.md
m2049r Mar 29, 2018
7d7de14
new version id for monero PR#3526 (#215)
m2049r Mar 30, 2018
eda3de1
added zxcvbn4j license (#216)
m2049r Apr 1, 2018
da8c8f8
new version for m2049r/monero 7e97e11 (#217)
m2049r Apr 2, 2018
df2ff8b
correct toolbar colour for testnet (#218)
m2049r Apr 2, 2018
60a7b15
new version for fixed malloc (83dcd65)
m2049r Apr 3, 2018
45aa8f3
fix openssl links
m2049r Apr 5, 2018
a4e9920
change suggested ringsize from 5 to 7 in help.xml (#223)
erciccione Apr 7, 2018
b37adb4
Update README.md
m2049r Apr 11, 2018
e9c74d4
Random fixes (#228)
m2049r Apr 15, 2018
dd59233
fix closing tag (#230)
m2049r Apr 15, 2018
161c155
update dependencies
m2049r Apr 16, 2018
d24b37e
info about missing crypto on some arm64 devices
m2049r Apr 16, 2018
66a6583
info about being XMR-only
m2049r Apr 16, 2018
c61a62c
edit gender-specific string (#231)
erciccione Apr 19, 2018
bc3c5b3
Add tranditional Chinese language (#226)
Lafudoci Apr 19, 2018
37f22a9
Added Italian Translation (#224)
hrumag Apr 19, 2018
6ce4b42
Merge pull request #2 from longyli/master
jianjunchu Apr 20, 2018
6be8bbd
a
jianjunchu Apr 20, 2018
48efe12
Merge branch 'master' of https://github.com/m2049r/xmrwallet into m20…
jianjunchu Apr 20, 2018
073bd96
CrAzYpass implementation (#234)
m2049r Apr 21, 2018
bdc2a72
march & april (#233)
m2049r Apr 21, 2018
0bb9e9c
add reference to the Localization Workgroup in the README (#235)
erciccione Apr 21, 2018
8bdc0f8
sgp suggestions (#242)
m2049r Apr 21, 2018
2ca7b41
Update zh-rTW translation for CrAzYpass (#243)
Lafudoci Apr 22, 2018
7879f31
use CrAzYpass for send verification as well (#249)
m2049r Apr 22, 2018
af58b76
add blank (#247)
m2049r Apr 22, 2018
96579c1
separate monero/monerujo folder for debug version (#245)
m2049r Apr 22, 2018
a003d25
Merge branch 'm2049r-master'
jianjunchu Apr 22, 2018
2e31f11
merge
jianjunchu Apr 22, 2018
63677d5
Added Norwegian-Bokmål translation (#238)
Codivorous Apr 22, 2018
5b26f1a
Update strings.xml (#251)
anhdres Apr 22, 2018
bcc85a5
Update help.xml (#250)
anhdres Apr 22, 2018
0b17ed4
Update strings.xml (#236)
anhdres Apr 22, 2018
1115bbb
Popup notice for new CrAzYpass feature (#254)
m2049r Apr 23, 2018
a2d6ca0
Implement fingerprint login method (#244)
0140454 Apr 24, 2018
bf95994
update gradle:3.1.2
m2049r Apr 25, 2018
d7d6601
Translation de (#253)
Flenst Apr 25, 2018
94abc00
fix notice layout (#257)
m2049r Apr 25, 2018
9b99954
added missing string for de translation (#258)
m2049r Apr 25, 2018
b4e1767
French (#248)
el00ruobuob Apr 25, 2018
7fdae76
remove untranslatable strings (#259)
m2049r Apr 25, 2018
e1a2572
Translate new Italian strings in strings.xml and help.xml (#252)
erciccione Apr 25, 2018
425246b
remove unused ids & strings (#266)
m2049r Apr 29, 2018
d18999e
don't try to generate 0-size qrcodes (#267)
m2049r Apr 29, 2018
42e4db5
Spanish update (#268)
m2049r Apr 29, 2018
3a839a0
shorten de label for receive button (#269)
m2049r Apr 30, 2018
ff6e00e
update monero version (#270)
m2049r Apr 30, 2018
39d2c0a
correct translation
m2049r Apr 30, 2018
63e0c26
correct translation
m2049r Apr 30, 2018
49acbb1
delete
jianjunchu May 2, 2018
1e35b9a
update
jianjunchu May 2, 2018
e2a33bf
update
jianjunchu May 2, 2018
4b846dc
add nfc support
jianjunchu May 8, 2018
086ae99
nfc support
jianjunchu May 8, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
shorten de label for receive button (m2049r#269)
m2049r authored Apr 30, 2018
commit 3a839a04d5fe3040367cd133287c8a7540261715
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@

<string name="label_watchonly">(Watch Only)</string>

<string name="label_wallet_receive">Empfangen</string>
<string name="label_wallet_receive">Nehmen</string>
<string name="label_wallet_send">Geben</string>

<string name="xmr_unconfirmed_amount">+ %1$s XMR unbestätigt</string>