Merge branch 'development' of github.com:open-keychain/open-keychain into development

2015-02-22 21:30:02 +01:00
parent e46fa777ab 7e0e16b014
commit e583edf020
3 changed files with 14 additions and 4 deletions
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -59,7 +59,7 @@
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:layout_width="0dip"
                    android:layout_height="match_parent"
-                    android:text="Start exchange"
+                    android:text="@string/btn_start_exchange"
                    android:layout_weight="1"
                    android:gravity="center_vertical" />