From 98af1fb6ee9c7c0128f5da2380f9af04106f3993 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Wed, 29 Oct 2014 14:34:22 -0700
Subject: [PATCH] shorten blocks of text

// FREEBIE
---
 res/layout/registration_activity.xml          | 26 +++++++++----------
 res/layout/registration_progress_activity.xml |  2 +-
 res/values/strings.xml                        |  5 ++--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/res/layout/registration_activity.xml b/res/layout/registration_activity.xml
index 342c6bf785..62cdebfeb3 100644
--- a/res/layout/registration_activity.xml
+++ b/res/layout/registration_activity.xml
@@ -6,24 +6,13 @@
             android:fillViewport="true"
             android:background="@drawable/background_pattern_repeat">
 
-    <LinearLayout android:paddingRight="16dip"
-                  android:paddingLeft="16dip"
+    <LinearLayout android:padding="16dp"
+                  android:paddingBottom="0dp"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:gravity="center_vertical"
                   android:orientation="vertical">
 
-        <TextView style="@style/Registration.Description"
-                  android:layout_width="fill_parent"
-                  android:layout_marginBottom="8dip"
-                  android:layout_marginTop="16dip"
-                  android:text="@string/registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users"/>
-
-        <TextView style="@style/Registration.Description"
-                  android:layout_width="fill_parent"
-                  android:layout_marginBottom="16dip"
-                  android:text="@string/registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy"/>
-
         <TextView style="@style/Registration.Label"
                   android:layout_width="fill_parent"
                   android:textAllCaps="true"
@@ -68,6 +57,17 @@
 
         </LinearLayout>
 
+        <TextView style="@style/Registration.Description"
+                  android:layout_width="fill_parent"
+                  android:layout_marginBottom="8dip"
+                  android:layout_marginTop="16dip"
+                  android:text="@string/registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users"/>
+
+        <TextView style="@style/Registration.Description"
+                  android:layout_width="fill_parent"
+                  android:layout_marginBottom="16dip"
+                  android:text="@string/registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy"/>
+
         <LinearLayout android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:layout_marginTop="16dip"
diff --git a/res/layout/registration_progress_activity.xml b/res/layout/registration_progress_activity.xml
index 7425dcc823..6261aad4e3 100644
--- a/res/layout/registration_progress_activity.xml
+++ b/res/layout/registration_progress_activity.xml
@@ -7,7 +7,7 @@
 
     <FrameLayout
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_height="wrap_content"
             android:gravity="center" >
 
         <LinearLayout
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 209e4e1a89..67a1fab034 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -559,8 +559,7 @@
 
     <!-- registration_activity -->
     <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
-        TextSecure can use instant messages to increase privacy and avoid SMS charges when communicating with other
-        TextSecure users. To enable this feature, please verify your country code and phone number.
+        Registering is free and increases privacy when messaging other TextSecure users. Please verify your phone number.
     </string>
     <string name="registration_activity__your_country">YOUR COUNTRY</string>
     <string name="registration_activity__your_country_code_and_phone_number">YOUR COUNTRY CODE AND
@@ -568,7 +567,7 @@
     </string>
     <string name="registration_activity__phone_number">PHONE NUMBER</string>
     <string name="registration_activity__register">Register</string>
-    <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registration will transmit some contact information to the server temporarily.</string>
+    <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registration transmits some contact information to the server. It is not stored.</string>
     <string name="registration_activity__skip">Skip</string>
 
     <!-- registration_problems -->