Merge remote-tracking branch 'upstream/master'

# Conflicts: # wallet/AndroidManifest.xml # wallet/build.gradle # wallet/src/de/schildbach/wallet/ui/preference/PreferenceActivity.java # wallet/src/de/schildbach/wallet/ui/send/FeeCategory.java
langerhans · Jan 17, 2016 · 34a9fbe · 34a9fbe
2 parents f6dd7e9 + 35f5f0f
commit 34a9fbe
Show file tree

Hide file tree

Showing 34 changed files with 224 additions and 162 deletions.
diff --git a/integration-android/build.gradle b/integration-android/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 dependencies {
-    compile('com.google.android:android:2.3.3') {
+    compile('com.google.android:android:4.0.1.2') {
         transitive false
     }
 }

diff --git a/market/market-description-nb.txt b/market/market-description-nb.txt
@@ -8,7 +8,7 @@
 • Konvertering til og fra nasjonale valutaer.
 • Sende og motta bitcoin via NFC, QR-koder eller Bitcoin-URLer.
 • Adressebok for regelmessig brukte Bitcoin-adresser.
-• Når du er frakoblet, kan du fortsatt betale via Bluetooth.
+• Når du er frakoblet, kan du fortsatt betale via blåtann.
 • Systemvarsling for mottatte mynter.
 • Sveiping av papirlommebøker (f.eks. de som brukes til kaldlagring).
 • Miniprogram for saldo over bitcoins.

diff --git a/market/market-description-zh-TW.txt b/market/market-description-zh-TW.txt
@@ -1,29 +1,36 @@
-讓你的比特幣只放在自己的口袋裡! 你可以利用QR二維條碼快速進行比特幣付款，商家可以更快速安全的完成比特幣請款，Bitcoin Wallet 是第一個在移動裝置可以使用的比特幣 App，並自認為是最安全的比特幣 App!
+<b>隨身攜帶你的 Bitcoin，就在你的口袋中！<b>你可以掃描 QR 條碼快速付款。商家也可以安全又快速的完成請款。Bitcoin Wallet 是第一個可以在行動設備使用的 Bitcoin app，並自認為是最安全的一個！
 
 
-<b>功能</b>
+<b>特點</b>
 
-• 不需註冊，不需登記網路服務或是任何雲端服務! 這個錢包App完全去中心化並利用點對點節點來服務。
-• 可顯示不同比特幣單位如 BTC、 mBTC 與 µBTC。
-• 自動轉換各國貨幣。
-• 可以藉由藍芽/NFC/QR二維條碼或是比特幣網址來接收或是支付比特幣。
-• 提供地址簿供常用比特幣地址使用。
-• 離線中仍然可以使用藍芽付款。
-• 收到比特幣會通知提醒。
-• 紙錢包移轉(例如冷存放使用)
-• 比特幣餘額桌面小工具。
+• 不需要註冊、不用登記網路服務、也不使用任何雲端服務！這個錢包 app 完全去中心，並使用對等網路(P2P)來服務。
+• 可以顯示不同 Bitcoin 金額單位，如 BTC、mBTC 與 µBTC。
+• 可以轉換各國貨幣。
+• 可以透過 NFC、QR 條碼、或是 Bitcoin 付款網址來付款及收款。
+• 可以用位址簿管理常用的 Bitcoin 位址。
+• 可以在離線時使用藍芽付款。
+• 可以在收到款項時通知提醒。
+• 可以兌現紙錢包(及其他冷儲存的媒介)。
+• Bitcoin 餘額桌面小工具。
 
 
-<b>貢獻</b>
+<b>出力</b>
 
-Bitcoin Wallet is <b>open source</b> and <b>free software</b>. License: GPLv3
+Bitcoin Wallet 既是<b>開放源碼</b>也是<b>自由軟體</b>。授權條款: GPLv3
 https://www.gnu.org/licenses/gpl-3.0.en.html
 
-Our source code is available at GitHub:
+我們的原始碼位在 GitHub:
 https://github.com/schildbach/bitcoin-wallet
 
-All translations are managed via Transifex:
+所有的翻譯工作都用 Transifex 管理:
 https://www.transifex.com/projects/p/bitcoin-wallet/
 
 
-<i>注意使用風險!</i>
+<b>大推</b>
+
+• 很多行動錢包的程式都從 Bitcoin Wallet 發展而來。比如說: blockchain.info、Hive、以及 KnC。
+• https://bitcoin.org 推薦的行動錢包
+• BitPay 推薦使用。
+
+
+<i>請自負使用風險！</i>
diff --git a/market/market-promo-text-zh-TW.txt b/market/market-promo-text-zh-TW.txt
@@ -1 +1 @@
-自己的比特幣只放在自己的口袋裡!
+你的 Bitcoin 就在自己的口袋裡！
diff --git a/sample-integration-android/AndroidManifest.xml b/sample-integration-android/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	android:versionCode="1"
 	android:versionName="1.0" >
 
-	<uses-sdk android:minSdkVersion="10" />
+	<uses-sdk android:minSdkVersion="15" />
 
 	<uses-feature
 		android:name="android.hardware.touchscreen"

diff --git a/sample-integration-android/build.gradle b/sample-integration-android/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 'android-10'
+    compileSdkVersion 'android-15'
     buildToolsVersion '23.0.2'
 
     lintOptions { abortOnError false }

diff --git a/sample-integration-android/project.properties b/sample-integration-android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-10
+target=android-15
diff --git a/wallet/CHANGES b/wallet/CHANGES
@@ -1,3 +1,11 @@
+v4.45
+
+* Adjusts to the new network fee rules imposed by Bitcoin Core.
+* Now requires Android 4.0.3 (ICS) for all subprojects.
+* Update Russian, Italian, Turkish, Swedish, Spanish, Norwegian Bokmål, Japanese, Hungarian,
+  Finnish, Dutch, Danish, Traditional Chinese and Brazilian Portuguese translations.
+* Based on bitcoinj 0.13.4.
+
 v4.44
 
 * Fix problem with sweeping paper wallets.

diff --git a/wallet/README b/wallet/README
@@ -51,7 +51,7 @@ You'll need git, a Java SDK 6 (or later) and Gradle 2.4 (or later) for this. I'l
 for the package installs, which comes with slightly more recent versions.
 
 	# first time only
-	sudo apt-get install git gradle openjdk-7-jdk libstdc++6:i386
+	sudo apt-get install git gradle openjdk-7-jdk libstdc++6:i386 zlib1g:i386
 
 Get the Android SDK (Tools only) from
 

diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -8,11 +8,11 @@ dependencies {
     compile(project(':integration-android')) {
         exclude(group: 'com.google.android', module: 'android')
     }
-    compile 'com.android.support:support-annotations:23.1.0'
-    compile 'com.android.support:support-v4:23.1.0'
-    compile 'com.android.support:support-v13:23.1.0'
-    compile 'com.android.support:recyclerview-v7:23.1.0'
-    compile 'com.android.support:cardview-v7:23.1.0'
+    compile 'com.android.support:support-annotations:23.1.1'
+    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:support-v13:23.1.1'
+    compile 'com.android.support:recyclerview-v7:23.1.1'
+    compile 'com.android.support:cardview-v7:23.1.1'
     compile 'org.libdohj:libdohj:0.14-SNAPSHOT'
     compile 'com.google.protobuf:protobuf-java:2.5.0'
     compile 'com.google.guava:guava:16.0.1'
@@ -31,7 +31,7 @@ ext {
 }
 
 android {
-    compileSdkVersion 'android-16'
+    compileSdkVersion 'android-21'
     buildToolsVersion '23.0.2'
     compileSdkVersion 22
 

diff --git a/wallet/proguard.cfg b/wallet/proguard.cfg
@@ -4,28 +4,13 @@
 -dontobfuscate
 -verbose
 
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Fragment
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
+-keepattributes *Annotation*
 
--keepclasseswithmembernames class * {
+-keepclasseswithmembernames,includedescriptorclasses class * {
     native <methods>;
 }
 
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers public class * extends android.view.View {
+-keepclassmembers,includedescriptorclasses public class * extends android.view.View {
     void set*(***);
     *** get*();
 }
@@ -39,8 +24,8 @@
     public static ** valueOf(java.lang.String);
 }
 
--keep class * implements android.os.Parcelable {
-    public static final android.os.Parcelable$Creator *;
+-keepclassmembers class * implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator CREATOR;
 }
 
 -keepclassmembers class **.R$* {
@@ -49,22 +34,33 @@
 
 # android-support
 -dontwarn android.support.**
+-dontnote android.support.**
 -keep class android.support.v7.widget.RoundRectDrawable { *; }
 
 # bitcoinj
--keep class org.bitcoinj.wallet.Protos$** { *; }
--keep class org.bitcoin.protocols.payments.Protos$** { *; }
+-keep,includedescriptorclasses class org.bitcoinj.wallet.Protos$** { *; }
+-keep,includedescriptorclasses class org.bitcoin.protocols.payments.Protos$** { *; }
 -dontwarn org.bitcoinj.store.WindowsMMapHack
 -dontwarn org.bitcoinj.store.LevelDBBlockStore
+-dontnote org.bitcoinj.crypto.DRMWorkaround
+-dontnote org.bitcoinj.crypto.TrustStoreLoader$DefaultTrustStoreLoader
+-dontnote com.subgraph.orchid.crypto.PRNGFixes
 -dontwarn okio.DeflaterSink
 -dontwarn okio.Okio
+-dontnote com.squareup.okhttp.internal.Platform
 
 # zxing
 -dontwarn com.google.zxing.common.BitMatrix
 
 # Guava
 -dontwarn sun.misc.Unsafe
--dontwarn com.google.common.collect.MinMaxPriorityQueue
+-dontnote com.google.common.reflect.**
+-dontnote com.google.common.util.concurrent.MoreExecutors
+-dontnote com.google.common.cache.Striped64,com.google.common.cache.Striped64$Cell
 
 # logback-android
 -dontwarn javax.mail.**
+-dontnote ch.qos.logback.core.rolling.helper.FileStoreUtil
+
+# Bitcoin Wallet
+-dontnote de.schildbach.wallet.util.Io
diff --git a/wallet/project.properties b/wallet/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-21
diff --git a/wallet/res/values-da/strings.xml b/wallet/res/values-da/strings.xml
@@ -28,6 +28,7 @@
   <string name="wallet_transactions_fragment_empty_text_sent">Ingen Bitcoins sendt endnu.</string>
   <string name="wallet_transactions_fragment_empty_text_howto">Hvordan får man Bitcoins?\n\nKøb for traditionelle penge,\nsælg varer eller ydelser eller\ntjen dem ved at arbejde.</string>
   <string name="wallet_transactions_row_warning_backup">Tillykke, du har modtaget din første betaling! Har du &lt;u&gt;taget en sikkerhedskopi af din tegnebog&lt;/u&gt;, for at beskytte dig mod tab?</string>
+  <string name="wallet_transactions_row_warning_storage_encryption">Tip: For at øge din tegnebogs sikkerhed kan du &lt;u&gt;kryptere din enhed&lt;/u&gt;. Dette beskytter også data fra andre apps.</string>
   <string name="wallet_transactions_fragment_coinbase">mined</string>
   <string name="wallet_transactions_fragment_internal">intern</string>
   <string name="wallet_transactions_options_filter">Filter</string>
@@ -43,8 +44,8 @@
   <string name="wallet_low_storage_dialog_title">Enheds interne lagerplads er lav!</string>
   <string name="wallet_low_storage_dialog_msg">Bitcoin Wallet bruger intern lager til at huske overførsler og blokke. Hvis den løber tør for plads, vil den stoppe med at virke og dine Bitcoins vil være i fare!\n\nVil du åbne app-håndteringen for at afinstallere ubrugte apps?</string>
   <string name="wallet_low_storage_dialog_button_apps">Håndtér apps</string>
-  <string name="wallet_timeskew_dialog_title">Tjek dine tidsindstillinger!</string>
-  <string name="wallet_timeskew_dialog_msg">Din enheds tid fraviger med %d minutter. Du kan sandsynligvis ikke sende eller modtage Bitcoins på grund af dette problem.\n\nDu bør tjekke og rette dine tids- og tidzoneindstillinger.</string>
+  <string name="wallet_timeskew_dialog_title">Tjek dato- og tidsindstillinger</string>
+  <string name="wallet_timeskew_dialog_msg">Din enheds tid går %d minutter skævt. Du kan sandsynligvis ikke sende eller modtage bitcoin på grund af dette.\n\nDu bør tjekke, og om nødvendigt rette, dine dato-, tids- og tidszoneindstillinger.</string>
   <string name="wallet_version_dialog_title">En ny version er tilgængelig!</string>
   <string name="wallet_version_dialog_msg">Denne version retter vigtige fejl. For detaljer, se ændringsloggen på Google Play.</string>
   <string name="wallet_version_dialog_msg_deprecated">Hvis du ikke ser en opdatering, betyder dette formodentlig, at din version af Android ikke understøttes længere.</string>
@@ -80,9 +81,9 @@
   <string name="send_coins_fragment_insufficient_money_msg1">Du mangler %s.</string>
   <string name="send_coins_fragment_insufficient_money_msg2">Vil du betale alt hvad du har?</string>
   <string name="send_coins_fragment_empty_wallet_failed_title">Tømning af tegnebog mislykkedes</string>
-  <string name="send_coins_fragment_state_decrypting">Afkrypterer …</string>
-  <string name="send_coins_preparation_msg">Signerer …</string>
-  <string name="send_coins_sending_msg">Sender …</string>
+  <string name="send_coins_fragment_state_decrypting">Afkrypterer…</string>
+  <string name="send_coins_preparation_msg">Signerer…</string>
+  <string name="send_coins_sending_msg">Sender…</string>
   <string name="send_coins_sent_msg">Sendt!</string>
   <string name="send_coins_failed_msg">Mislykkedes!</string>
   <string name="send_coins_error_msg">Problem under afsendelse af bitcoin!</string>
@@ -93,7 +94,7 @@
   <string name="send_coins_options_empty">Tøm tegnebog</string>
   <string name="raise_fee_dialog_title">Forhøj netværksgebyr</string>
   <string name="raise_fee_dialog_message">Vil du forhøje denne betalings gebyr med %s? Det vil få betalingen til at blive bekræftet hurtigere.</string>
-  <string name="raise_fee_dialog_state_decrypting">Afkrypterer …</string>
+  <string name="raise_fee_dialog_state_decrypting">Afkrypterer…</string>
   <string name="raise_fee_dialog_state_done">Færdig.</string>
   <string name="raise_fee_dialog_button_raise">Forhøj</string>
   <string name="sweep_wallet_activity_title">Ryd papirtegnebog</string>
@@ -106,15 +107,15 @@
   <string name="sweep_wallet_fragment_balance">Saldo der skal ryddes</string>
   <string name="sweep_wallet_fragment_button_decrypt">Afkryptér</string>
   <string name="sweep_wallet_fragment_button_sweep">Ryd</string>
-  <string name="sweep_wallet_fragment_decrypt_progress">Afkrypterer …\nTager op til 2 minutter.</string>
-  <string name="sweep_wallet_fragment_request_wallet_balance_progress">Indlæser saldo …</string>
+  <string name="sweep_wallet_fragment_decrypt_progress">Afkrypterer…\nTager op til 2 minutter.</string>
+  <string name="sweep_wallet_fragment_request_wallet_balance_progress">Indlæser saldo…</string>
   <string name="sweep_wallet_fragment_request_wallet_balance_failed_title">Indlæsning af tegnebogens saldo mislykkedes</string>
   <string name="sweep_wallet_fragment_insufficient_money_title">Ikke nok bitcoin</string>
   <string name="sweep_wallet_fragment_insufficient_money_msg">Mængden af bitcoin i tegnebogen er for lille til rydning.</string>
   <string name="sweep_wallet_options_reload">Genindlæs saldo</string>
   <string name="maintenance_dialog_title">Vedligeholdelse anbefales</string>
   <string name="maintenance_dialog_message">Du har modtaget %1$s til usikre adresser. Vil du flytte disse til sikre adresser? Et lille netværksgebyr på %2$s vil opkræves.</string>
-  <string name="maintenance_dialog_state_decrypting">Afkrypterer …</string>
+  <string name="maintenance_dialog_state_decrypting">Afkrypterer…</string>
   <string name="maintenance_dialog_state_done">Færdig.</string>
   <string name="maintenance_dialog_button_move">Flyt</string>
   <string name="request_coins_activity_title">Forespørg Bitcoins</string>
@@ -123,7 +124,7 @@
   <string name="request_coins_fragment_initiate_request_qr">Få afsenderen til at scanne denne kode.</string>
   <string name="request_coins_fragment_initiate_request_nfc">Eller berør en NFC-aktiveret enhed.</string>
   <string name="request_coins_clipboard_msg">Bitcoin-forespørgsel kopieret til udklipsholderen</string>
-  <string name="request_coins_share_dialog_title">Del forespørgsel efter Bitcoins …</string>
+  <string name="request_coins_share_dialog_title">Del forespørgsel efter Bitcoins…</string>
   <string name="request_coins_no_local_app_msg">Ingen anden Bitcoin-app fundet</string>
   <string name="request_coins_options_local_app_title">Forespørg fra lokal app</string>
   <string name="address_book_activity_title">Adressebog</string>
@@ -205,8 +206,8 @@
   <string name="encrypt_keys_dialog_password_strength_good">god</string>
   <string name="encrypt_keys_dialog_password_strength_strong">stærk</string>
   <string name="encrypt_keys_dialog_show">Vis PIN</string>
-  <string name="encrypt_keys_dialog_state_encrypting">Krypterer …</string>
-  <string name="encrypt_keys_dialog_state_decrypting">Afkrypterer …</string>
+  <string name="encrypt_keys_dialog_state_encrypting">Krypterer…</string>
+  <string name="encrypt_keys_dialog_state_decrypting">Afkrypterer…</string>
   <string name="encrypt_keys_dialog_state_done">Færdig.</string>
   <string name="scan_camera_problem_dialog_title">Beklager</string>
   <string name="scan_camera_problem_dialog_message">Der er et problem med kameraet. En gentstart af enheden er sandsynligvis nødvendig.</string>
@@ -247,9 +248,9 @@
   <string name="preferences_initiate_reset_dialog_positive">Nulstil</string>
   <string name="preferences_extended_public_key_title">Vis xpub</string>
   <string name="preferences_extended_public_key_summary">Vis din tegnebogs udvidede offentlige nøgle så den kan importeres til andre apps og tjenester. Vær forsigtig: Du vil afsløre dit økonomiske privatliv til pågældende app, hvis du gør dette.</string>
-  <string name="bitmap_fragment_share">Del …</string>
+  <string name="bitmap_fragment_share">Del…</string>
   <string name="extended_public_key_fragment_title">Udvidet offentlig nøgle</string>
-  <string name="extended_public_key_fragment_share">Del xpub …</string>
+  <string name="extended_public_key_fragment_share">Del xpub…</string>
   <string name="report_issue_dialog_title_issue">Rapportér problem</string>
   <string name="report_issue_dialog_title_crash">Tidligere programnedbrud opfanget</string>
   <string name="report_issue_dialog_message_issue">Beskriv venligst dit problem præcist nok til, at det kan genskabes.</string>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		自己的比特幣只放在自己的口袋裡!
		你的 Bitcoin 就在自己的口袋裡！