Merge remote-tracking branch 'upstream/master'

Conflicts:
	wallet/.gitignore
	wallet/AndroidManifest.xml
	wallet/assets/checkpoints-testnet.txt
	wallet/assets/checkpoints.txt
	wallet/pom.xml
	wallet/res/values-cs/strings.xml
	wallet/res/values-de/strings.xml
	wallet/res/values-es/strings.xml
	wallet/res/values-fr/strings.xml
	wallet/res/values-fr/strings_help.xml
	wallet/res/values-it/strings.xml
	wallet/res/values-nl/strings.xml
	wallet/res/values-nl/strings_help.xml
	wallet/res/values-pt-rBR/strings.xml
	wallet/res/values-ru/strings.xml
	wallet/res/values-ru/strings_help.xml
	wallet/res/values-zh/strings.xml
	wallet/res/values-zh/strings_help.xml
	wallet/res/values/strings.xml
	wallet/res/xml/preference_about.xml
	wallet/src/de/langerhans/wallet/ui/TransactionsListAdapter.java
	wallet/src/de/langerhans/wallet/ui/preference/PreferenceActivity.java
	wallet/src/de/schildbach/wallet/service/AutosyncReceiver.java

market/market-description-cs.txt

@@ -1,4 +1,4 @@
-<b>Mějte své Bitcoiny vždy s sebou ve své kapse!</b> Plaťte rychým oskenováním QR kódu. A jako prodejce můžete přijímat platby spolehlivě a rychle. Bitcoin Wallet je mobilní Bitcoin aplikace číslo jedna a jedna z nejbezpečnějších!
+<b>Mějte své Bitcoiny vždy s sebou ve své kapse!</b> Plaťte rychlým oskenováním QR kódu. A jako prodejce můžete přijímat platby spolehlivě a rychle. Bitcoin Wallet je mobilní Bitcoin aplikace číslo jedna a jedna z nejbezpečnějších!
 
 
 <b>FUNKCE</b>
@@ -11,7 +11,7 @@
 • Pokud jste offline, stále můžete platit přes Bluetooth.
 • Systémové notifikace při přijaté platbě
 • Načítání papírových peněženek (např. ty co se používají u cold storage).
-• Widget pro zborazení Bitcoin bilance.
+• Widget pro zobrazení Bitcoin bilance.
 
 
 <b>PŘISPĚJTE</b>

market/market-description-pt-BR.txt

@@ -1,22 +1,36 @@
-Tenha os seus Bitcoins sempre com você, no seu bolso! Efetue pagamentos rapidamente apenas escaneando um código QR​​. Como comerciante, você pode receber pagamentos de forma confiável e instantaneamente. O Bitcoin Wallet é o primeiro aplicativo Bitcoin móvel, e, possivelmente, o mais seguro!
+<b>Tenha os seus Bitcoins sempre com você, no seu bolso!</b> Efetue pagamentos rapidamente apenas escaneando um código QR. Como comerciante, você pode receber pagamentos de forma confiável e instantaneamente. O Bitcoin Wallet é o primeiro aplicativo Bitcoin móvel, e, possivelmente, o mais seguro!
 
-CARACTERÍSTICAS:
+
+<b>CARACTERÍSTICAS</b>
 
 • Sem necessidade de cadastro, serviço web ou hospedagem! Esta carteira é descentralizada e "peer to peer".
-• Exibe a quantidade de Bitcoins em BTC e mBTC.
+• Exibe a quantidade de Bitcoins em BTC, mBTC e µBTC.
 • Conversão para moedas nacionais.
 • Envio e recebimento de Bitcoins via NFC, códigos QR ou endereços Bitcoin.
 • Catálogo para guardar os endereços mais utilizados.
 • Quando você estiver off-line, você ainda pode pagar via Bluetooth.
 • Notificações do sistema para moedas recebidas.
+• Varrer de carteiras de papel (por exemplo, aqueles usados para o armazenamento a frio).
 • Widget para saldo de Bitcoins.
 
-Mais informações sobre Bitcoin em
-http://bitcoin.org
 
-Se você deseja contribuir com o Bitcoin Wallet, o projeto encontra-se em
+<b>CONTRIBUA</b>
+
+Bitcoin Wallet é <b>open source</ b> e <b>software livre</ b>. Licença: GPLv3
+https://www.gnu.org/licenses/gpl-3.0.en.html
+
+Nosso código fonte está disponível no GitHub:
 https://github.com/schildbach/bitcoin-wallet
 
-Licença: GPLv3
-Use por sua conta e risco!
-http://www.gnu.org/licenses/gpl-3.0.en.html
+Todas as traduções são gerenciadas via Transifex:
+https://www.transifex.com/projects/p/bitcoin-wallet/
+
+
+<b>TESTEMUNHOS</b>
+
+• Muitas carteiras móveis baseiam seu código em Bitcoin Wallet. Exemplos: blockchain.info, colmeia e KNC.
+• Carteira mobile recomendada por https://bitcoin.org
+• Recomendado por BitPay.
+
+
+<i>Use por sua conta e risco!</i>

market/market-description-zh.txt

@@ -1,22 +1,36 @@
-有您跟您的比特币在一起，在您的钱包！你可以快速通过扫描二维码支付。作为一个商人，您可以可靠的及时收到付款。这是第一个比特币移动钱包应用程式，也可以说是最安全的！
+<b>将比特币随身携带，在您的口袋中！</b> 扫描二维码快速支付，即时可靠的接收付款。比特币钱包 (Bitcoin Wallet) 是首选的、最安全的比特币应用！
 
-特点:
 
-• 无需注册,需要 web 服务以及云计算! 这是个去中心化点对点的钱包.
-• BTC、mBTC、µBTC都是显示比特币数量的单位。
-• 转换成国家货币单位。
-• 发送和接受比特币可以通过 NFC，二维码或者比特币地址。
-• 地址薄，经常使用的比特币地址。
-• 当你处于网络无法连接的时候，你可以使用蓝牙付款。
-• 系统收到货币的通知。
-• 比特币余额的应用程式。
+<b>功能</b>
 
-你可以找到更多关于比特币的
-http://bitcoin.org
+• 不需要注册，不需要网络服务，也不需要云！比特币钱包是“去中心化”的，点对点的 (peer to peer)。
+• 以 BTC, mBTC 以及 µBTC 为单位显示比特币金额。
+• 从比特币转换为国家货币，或者从国家货币转换为比特币。
+• 通过 NFC，二维码、比特币链接发送或接收比特币。
+• 为经常使用的比特币地址创建地址簿。
+• 断网情况下仍然可以通过蓝牙付款。
+• 收到比特币时显示系统通知。
+• 与纸钱包交换比特币（纸钱包经常用于冷存储）。
+• 应用程序小部件，用于显示比特币余额。
 
-如果你想参与比特币钱包维护，该项目位于
+
+<b>贡献</b>
+
+Bitcoin Wallet 是 <b>开源项目</b> 和 <b>自由软件</b>，以 GPLv3 授权。
+https://www.gnu.org/licenses/gpl-3.0.en.html
+
+源代码托管在 GitHub:
 https://github.com/schildbach/bitcoin-wallet
 
-授权: GPLv3
-您使用的风险!
-http://www.gnu.org/licenses/gpl-3.0.en.html
+所有的本地化翻译均在 Transifex 上进行：
+https://www.transifex.com/projects/p/bitcoin-wallet/
+
+
+<b>评价</b>
+
+• 很多的移动钱包应用程序都基于 Bitcoin Wallet，比如：blockchain.info, Hive 以及 KnC.
+• 由 https://bitcoin.org 推荐的移动钱包。
+• 由 BitPay 推荐的移动钱包。
+
+
+<i>您需要自担风险！</i>

market/market-promo-text-zh.txt

@@ -1 +1 @@
-您的比特币，存在您的钱包里。
+您的比特币，装进您的口袋！

wallet/AndroidManifest.xml

@@ -58,12 +58,12 @@
 		android:name="de.langerhans.wallet.WalletApplication"
 		android:allowBackup="false"
 		android:icon="@drawable/app_icon"
-		android:label="@string/app_name"
-		android:theme="@style/My.Theme" >
+		android:label="@string/app_name" >
 		<activity
 			android:name="de.langerhans.wallet.ui.WalletActivity"
 			android:configChanges="keyboard|keyboardHidden"
-			android:launchMode="singleTask" />
+			android:launchMode="singleTask"
+			android:theme="@style/My.Theme" />
 
 		<activity-alias
 			android:name="de.langerhans.wallet.WalletActivity"
@@ -87,6 +87,7 @@
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/send_coins_activity_title"
 			android:screenOrientation="behind"
+			android:theme="@style/My.Theme.ChildActivity"
 			android:windowSoftInputMode="adjustResize" >
 			<intent-filter android:label="@string/send_coins_activity_title" >
 				<action android:name="android.intent.action.VIEW" />
@@ -128,26 +129,31 @@
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/request_coins_activity_title"
 			android:screenOrientation="behind"
+			android:theme="@style/My.Theme.ChildActivity"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="de.langerhans.wallet.ui.AddressBookActivity"
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/address_book_activity_title"
-			android:screenOrientation="behind" />
+			android:screenOrientation="behind"
+			android:theme="@style/My.Theme.ChildActivity" />
 		<activity
 			android:name="de.langerhans.wallet.ui.ExchangeRatesActivity"
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/exchange_rates_activity_title"
-			android:screenOrientation="behind" />
+			android:screenOrientation="behind"
+			android:theme="@style/My.Theme.ChildActivity" />
 		<activity
 			android:name="de.langerhans.wallet.ui.NetworkMonitorActivity"
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/network_monitor_activity_title"
-			android:screenOrientation="behind" />
+			android:screenOrientation="behind"
+			android:theme="@style/My.Theme.ChildActivity" />
 		<activity
 			android:name="de.langerhans.wallet.ui.preference.PreferenceActivity"
 			android:label="@string/preferences_activity_title"
-			android:screenOrientation="behind" />
+			android:screenOrientation="behind"
+			android:theme="@style/My.Theme.ChildActivity" />
 		<activity
 			android:name="de.langerhans.wallet.ui.RestoreWalletActivity"
 			android:configChanges="orientation|keyboard|keyboardHidden"
@@ -173,6 +179,7 @@
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/sweep_wallet_activity_title"
 			android:screenOrientation="behind"
+			android:theme="@style/My.Theme.ChildActivity"
 			android:windowSoftInputMode="adjustResize" />
 
 		<provider

wallet/CHANGES

@@ -1,3 +1,19 @@
+v4.19
+
+* Remove donate action.
+
+v4.18
+
+* Show and share extended public key. This can be used to grant read-only access to your wallet.
+  The new option is available in the diagnostics settings.
+* Record fiat amount for sent payments.
+
+v4.17
+
+* Update action buttons to material design.
+* Update Finnish, Catalan, Swedish, Brazilian Portuguese, Italian, Spanish, Russian, French,
+  Dutch, Czech and Chinese translations.
+
 v4.16
 
 * Important fix for when a wallet is restored via an external app, the QR code on the main screen

wallet/pom.xml

@@ -141,7 +141,7 @@
 			<build>
 				<plugins>
 					<plugin>
-		                <groupId>com.simpligility.maven.plugins</groupId>
+		                                <groupId>com.simpligility.maven.plugins</groupId>
 						<artifactId>android-maven-plugin</artifactId>
 						<configuration>
 							<release>true</release>
@@ -187,7 +187,7 @@
 						<phase>initialize</phase>
 						<configuration>
 							<srcDir>graphics</srcDir>
-							<srcIncludes>app_icon.svg</srcIncludes>
+							<srcIncludes>ic_app_color_48dp.svg</srcIncludes>
 							<destDir>${basedir}/res/drawable-hdpi/</destDir>
 							<width>72</width>
 							<height>72</height>
@@ -201,7 +201,7 @@
 						<phase>initialize</phase>
 						<configuration>
 							<srcDir>graphics</srcDir>
-							<srcIncludes>app_icon.svg</srcIncludes>
+							<srcIncludes>ic_app_color_48dp.svg</srcIncludes>
 							<destDir>${basedir}/res/drawable-xhdpi/</destDir>
 							<width>96</width>
 							<height>96</height>
@@ -215,7 +215,7 @@
 						<phase>initialize</phase>
 						<configuration>
 							<srcDir>graphics</srcDir>
-							<srcIncludes>app_icon.svg</srcIncludes>
+							<srcIncludes>ic_app_color_48dp.svg</srcIncludes>
 							<destDir>${basedir}/res/drawable-xxhdpi/</destDir>
 							<width>144</width>
 							<height>144</height>

wallet/proguard.cfg

@@ -1,9 +1,8 @@
--optimizationpasses 5
 -dontskipnonpubliclibraryclasses
+-dontoptimize
 -dontpreverify
 -dontobfuscate
 -verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable
 
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Fragment
@@ -13,7 +12,6 @@
 -keep public class * extends android.content.ContentProvider
 -keep public class * extends android.app.backup.BackupAgentHelper
 -keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
 
 -keepclasseswithmembernames class * {
     native <methods>;
@@ -27,8 +25,13 @@
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
 
+-keepclassmembers public class * extends android.view.View {
+    void set*(***);
+    *** get*();
+}
+
 -keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
+    public void *(android.view.View);
 }
 
 -keepclassmembers enum * {
@@ -37,11 +40,15 @@
 }
 
 -keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
+    public static final android.os.Parcelable$Creator *;
+}
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
 }
 
 # android-support
--dontwarn android.support.v4.**
+-dontwarn android.support.**
 
 # bitcoinj
 -keep class org.bitcoinj.wallet.Protos$** { *; }

wallet/res/drawable/action_bar_up_indicator.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+	<item
+		android:left="8dp"
+		android:right="8dp">
+		<bitmap android:src="@drawable/ic_arrow_back_white_24dp" />
+	</item>
+
+</layer-list>

wallet/res/layout/address_book_twopanes.xml

@@ -39,7 +39,7 @@
 		</FrameLayout>
 	</LinearLayout>
 
-	<View
+	<Space
 		android:layout_width="1dp"
 		android:layout_height="match_parent"
 		android:background="@color/bg_less_bright" />

wallet/res/layout/extended_public_key_dialog.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:background="@color/bg_less_bright" >
+
+	<ImageView
+		android:id="@+id/extended_public_key_dialog_image"
+		android:layout_width="@dimen/bitmap_dialog_qr_size"
+		android:layout_height="@dimen/bitmap_dialog_qr_size"
+		android:layout_gravity="center_horizontal"
+		android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax"
+		android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
+		android:background="@color/bg_bright"
+		android:keepScreenOn="true"
+		android:padding="4dp"
+		android:scaleType="centerInside" />
+
+</FrameLayout>

wallet/res/layout/network_monitor_twopanes.xml

@@ -40,7 +40,7 @@
 		</FrameLayout>
 	</LinearLayout>
 
-	<View
+	<Space
 		android:layout_width="1dp"
 		android:layout_height="match_parent"
 		android:background="@color/bg_less_bright" />

wallet/res/layout/transaction_row_extended.xml

@@ -80,7 +80,7 @@
 		android:orientation="horizontal"
 		android:paddingTop="4dp" >
 
-		<View
+		<Space
 			android:layout_width="@dimen/symbol_size_normal"
 			android:layout_height="@dimen/symbol_size_normal"
 			android:layout_marginRight="8dp" />
@@ -103,14 +103,38 @@
 			android:textSize="@dimen/font_size_normal" />
 	</LinearLayout>
 
+	<LinearLayout
+		android:id="@+id/transaction_row_extend_fiat"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:paddingTop="4dp"
+		android:visibility="gone" >
+
+		<Space
+			android:layout_width="0px"
+			android:layout_height="@dimen/symbol_size_normal"
+			android:layout_marginRight="8dp"
+			android:layout_weight="1" />
+
+		<de.schildbach.wallet.ui.CurrencyTextView
+			android:id="@+id/transaction_row_fiat"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="right"
+			android:layout_marginLeft="8dp"
+			android:textColor="@color/fg_insignificant"
+			android:textSize="@dimen/font_size_normal" />
+	</LinearLayout>
+
 	<LinearLayout
 		android:id="@+id/transaction_row_extend_message"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		android:paddingTop="4dp" >
 
-		<View
+		<Space
 			android:layout_width="@dimen/symbol_size_normal"
 			android:layout_height="@dimen/symbol_size_normal"
 			android:layout_marginRight="8dp" />