Fix copy

res/layout-sw400dp/activity_display_name_v2.xml

@@ -29,7 +29,7 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
-        android:text="This is how others will be able to recognize you." />
+        android:text="This will be your name when you use Session." />
 
     <EditText
         style="@style/SessionEditText"

res/layout-sw400dp/activity_landing.xml

@@ -39,7 +39,7 @@
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginLeft="@dimen/massive_spacing"
         android:layout_marginRight="@dimen/massive_spacing"
-        android:text="Create Account" />
+        android:text="Create Session ID" />
 
     <Button
         style="@style/MediumProminentOutlineButton"

res/layout-sw400dp/activity_register.xml

@@ -29,7 +29,7 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
-        android:text="Your Session ID is the unique address that people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design." />
+        android:text="Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design." />
 
     <TextView
         style="@style/SessionIDTextView"

res/layout-sw400dp/activity_seed_v2.xml

@@ -35,7 +35,7 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
-        android:text="Think of this as the crypto-equivalent of a social security number. This allows whomever has it complete access to your account." />
+        android:text="Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don’t give it to anyone. To restore your Session ID, launch Session and tap Continue your Session." />
 
     <TextView
         style="@style/SessionIDTextView"

res/layout-sw400dp/fragment_enter_chat_url.xml

@@ -28,7 +28,7 @@
         android:textColor="@color/text"
         android:alpha="0.6"
         android:textAlignment="center"
-        android:text="Enter the URL of the channel you'd like to join" />
+        android:text="Enter an open group URL" />
 
     <View
         android:layout_width="0dp"

res/layout/activity_display_name_v2.xml

@@ -29,7 +29,7 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/small_font_size"
         android:textColor="@color/text"
-        android:text="This is how others will be able to recognize you." />
+        android:text="This will be your name when you use Session." />
 
     <EditText
         style="@style/SmallSessionEditText"

res/layout/activity_landing.xml

@@ -39,7 +39,7 @@
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginLeft="@dimen/massive_spacing"
         android:layout_marginRight="@dimen/massive_spacing"
-        android:text="Create Account" />
+        android:text="Create Session ID" />
 
     <Button
         style="@style/MediumProminentOutlineButton"

res/layout/activity_linked_devices.xml

@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:textSize="@dimen/medium_font_size"
             android:textColor="@color/text"
-            android:text="You don't have any linked devices yet" />
+            android:text="You haven't linked any devices yet" />
 
         <Button
             style="@style/MediumProminentOutlineButton"

res/layout/activity_register.xml

@@ -29,7 +29,7 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/small_font_size"
         android:textColor="@color/text"
-        android:text="Your Session ID is the unique address that people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design." />
+        android:text="Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design." />
 
     <TextView
         style="@style/SessionIDTextView"

res/layout/activity_seed_v2.xml

@@ -35,7 +35,7 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
-        android:text="Think of this as the crypto-equivalent of a social security number. This allows whomever has it complete access to your account." />
+        android:text="Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don’t give it to anyone. To restore your Session ID, launch Session and tap Continue your Session." />
 
     <TextView
         style="@style/SessionIDTextView"

res/layout/activity_settings.xml

@@ -219,7 +219,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textStyle="bold"
                 android:gravity="center"
-                android:text="Linked Devices" />
+                android:text="Devices" />
 
             <View
                 android:id="@+id/seedButtonTopSeparator"
@@ -236,7 +236,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textStyle="bold"
                 android:gravity="center"
-                android:text="Show Recovery Phrase" />
+                android:text="Recovery Phrase" />
 
             <View
                 android:layout_width="match_parent"

res/layout/dialog_clear_all_data.xml

@@ -24,7 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/large_spacing"
-        android:text="This will delete your entire account, including all data, any messages currently linked to your Session ID, as well as your personal key pair."
+        android:text="This will permanently delete your Session ID, including all messages, sessions, and contacts."
         android:textColor="@color/text"
         android:textSize="@dimen/small_font_size"
         android:textAlignment="center" />

res/layout/dialog_link_device_master_mode.xml

@@ -39,7 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/large_spacing"
-        android:text="Create a new account on your other device and click "Link to an existing account" to start the linking process"
+        android:text="Open Session on your secondary device and tap "Link to an existing account""
         android:textColor="@color/text"
         android:alpha="0.6"
         android:textSize="@dimen/small_font_size"

res/layout/dialog_seed.xml

@@ -33,7 +33,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/large_spacing"
-        android:text="This is your personal recovery phrase. It can be used to restore your account or migrate your account to a new device."
+        android:text="This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device."
         android:textColor="@color/text"
         android:textSize="@dimen/small_font_size"
         android:textAlignment="center"

res/layout/fragment_enter_chat_url.xml

@@ -28,7 +28,7 @@
         android:textColor="@color/text"
         android:alpha="0.6"
         android:textAlignment="center"
-        android:text="Enter the URL of the channel you'd like to join" />
+        android:text="Enter an open group URL" />
 
     <View
         android:layout_width="0dp"

res/layout/fragment_scan_qr_code_v2.xml

@@ -31,7 +31,7 @@
             android:padding="@dimen/very_large_spacing"
             android:gravity="center"
             android:background="@color/navigation_bar_background"
-            android:text="Users can share their QR code by going into their account settings and tapping "Share QR Code""
+            android:text="Scan a user’s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings."
             android:textSize="@dimen/small_font_size"
             android:textColor="@color/text" />
 

res/layout/fragment_view_my_qr_code.xml

@@ -54,7 +54,7 @@
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
                 android:textAlignment="center"
-                android:text="This is your unique public QR code. Other users can scan this to start a conversation with you." />
+                android:text="This is your QR code. Other users can scan it to start a session with you." />
 
             <Button
                 style="@style/MediumUnimportantOutlineButton"

res/layout/view_fake_chat.xml

@@ -22,7 +22,7 @@
         android:layout_width="@dimen/fake_chat_view_bubble_width"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/medium_spacing"
-        android:text="It's a secure, decentralized private messaging app"
+        android:text="It's a decentralized, encrypted messaging app"
         android:layout_gravity="left" />
 
     <TextView

src/org/thoughtcrime/securesms/loki/redesign/activities/CreatePrivateChatActivity.kt

@@ -34,7 +34,7 @@ class CreatePrivateChatActivity : PassphraseRequiredActionBarActivity(), ScanQRC
         // Set content view
         setContentView(R.layout.activity_create_private_chat)
         // Set title
-        supportActionBar!!.title = "New Conversation"
+        supportActionBar!!.title = "New Session"
         // Set up view pager
         viewPager.adapter = adapter
         tabLayout.setupWithViewPager(viewPager)
@@ -78,7 +78,7 @@ private class CreatePrivateChatActivityAdapter(val activity: CreatePrivateChatAc
             1 -> {
                 val result = ScanQRCodeWrapperFragment()
                 result.delegate = activity
-                result.message = "Users can share their QR code by going into their account settings and tapping \"Share QR Code\""
+                result.message = "Scan a user’s QR code to start a session. QR codes can be found by tapping the QR code icon in account settings."
                 result
             }
             else -> throw IllegalStateException()

src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt

@@ -33,7 +33,7 @@ class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCode
         // Set content view
         setContentView(R.layout.activity_join_public_chat)
         // Set title
-        supportActionBar!!.title = "Join Channel"
+        supportActionBar!!.title = "Join Open Group"
         // Set up view pager
         viewPager.adapter = adapter
         tabLayout.setupWithViewPager(viewPager)
@@ -100,7 +100,7 @@ private class JoinPublicChatActivityAdapter(val activity: JoinPublicChatActivity
             1 -> {
                 val result = ScanQRCodeWrapperFragment()
                 result.delegate = activity
-                result.message = "Scan the QR code of the channel you'd like to join"
+                result.message = "Scan the QR code of the open group you'd like to join"
                 result
             }
             else -> throw IllegalStateException()
@@ -109,7 +109,7 @@ private class JoinPublicChatActivityAdapter(val activity: JoinPublicChatActivity
 
     override fun getPageTitle(index: Int): CharSequence? {
         return when (index) {
-            0 -> "Enter Channel URL"
+            0 -> "Open Group URL"
             1 -> "Scan QR Code"
             else -> throw IllegalStateException()
         }

src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt

@@ -43,7 +43,7 @@ class LinkedDevicesActivity : PassphraseRequiredActionBarActivity, LoaderManager
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
         setContentView(R.layout.activity_linked_devices)
-        supportActionBar!!.title = "Linked Devices"
+        supportActionBar!!.title = "Devices"
         recyclerView.adapter = linkedDevicesAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
         linkDeviceButton.setOnClickListener { linkDevice() }

src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt

@@ -3,14 +3,10 @@ package org.thoughtcrime.securesms.loki.redesign.activities
 import android.Manifest
 import android.content.Intent
 import android.graphics.Bitmap
-import android.graphics.Typeface
 import android.os.Bundle
 import android.os.Environment
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentPagerAdapter
-import android.text.Spannable
-import android.text.SpannableStringBuilder
-import android.text.style.StyleSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -124,9 +120,9 @@ class ViewMyQRCodeFragment : Fragment() {
         val size = toPx(280, resources)
         val qrCode = QRCodeUtilities.encode(hexEncodedPublicKey, size, false, false)
         qrCodeImageView.setImageBitmap(qrCode)
-        val explanation = SpannableStringBuilder("This is your unique public QR code. Other users can scan this to start a conversation with you.")
+//        val explanation = SpannableStringBuilder("This is your unique public QR code. Other users can scan this to start a conversation with you.")
-        explanation.setSpan(StyleSpan(Typeface.BOLD), 8, 34, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+//        explanation.setSpan(StyleSpan(Typeface.BOLD), 8, 34, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-        explanationTextView.text = explanation
+        explanationTextView.text = "This is your QR code. Other users can scan it to start a session with you."
         shareButton.setOnClickListener { shareQRCode() }
     }
 

src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt

@@ -38,7 +38,7 @@ class SeedActivity : BaseActionBarActivity() {
         val seedReminderViewTitle = SpannableString("You're almost finished! 90%")
         seedReminderViewTitle.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, theme)), 24, 27, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         seedReminderView.title = seedReminderViewTitle
-        seedReminderView.subtitle = "Press the redacted words to view your recovery phrase and secure your account"
+        seedReminderView.subtitle = "Tap and hold the redacted words to reveal your recovery phrase, then store it safely to secure your Session ID."
         seedReminderView.setProgress(90, false)
         seedReminderView.hideContinueButton()
         var redactedSeed = seed