From 29af1669e1c9170be9dd13c0f8bc9734aa9dc4b0 Mon Sep 17 00:00:00 2001
From: RiseT <RiseT@users.noreply.github.com>
Date: Mon, 19 Mar 2018 21:48:18 +0100
Subject: [PATCH] Export strings from registration_call_me_view Export strings
 from webrtc_call_screen

Closes #7543
---
 res/layout/registration_call_me_view.xml | 4 ++--
 res/layout/webrtc_call_screen.xml        | 6 +++---
 res/values/strings.xml                   | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/res/layout/registration_call_me_view.xml b/res/layout/registration_call_me_view.xml
index 45c014f0e3..a31bb286f3 100644
--- a/res/layout/registration_call_me_view.xml
+++ b/res/layout/registration_call_me_view.xml
@@ -21,7 +21,7 @@
               android:layout_marginLeft="10dp"
               android:gravity="center_vertical"
               android:textSize="16sp"
-              android:text="Call me instead"/>
+              android:text="@string/RegistrationActivity_call_me_instead"/>
 
     <TextView android:id="@+id/available_in_text"
               android:layout_width="wrap_content"
@@ -31,7 +31,7 @@
               android:layout_centerVertical="true"
               android:gravity="center_vertical"
               android:textSize="16sp"
-              android:text="Available in: "/>
+              android:text="@string/RegistrationActivity_available_in"/>
 
     <TextView android:id="@+id/countdown"
               android:layout_width="wrap_content"
diff --git a/res/layout/webrtc_call_screen.xml b/res/layout/webrtc_call_screen.xml
index 896f123321..6c78a9f075 100644
--- a/res/layout/webrtc_call_screen.xml
+++ b/res/layout/webrtc_call_screen.xml
@@ -74,13 +74,13 @@
                         android:layout_height="wrap_content">
 
                     <Button android:id="@+id/accept_safety_numbers"
-                            android:text="Accept"
+                            android:text="@string/WebRtcCallScreen_accept"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginRight="10dp"/>
 
                     <Button android:id="@+id/cancel_safety_numbers"
-                            android:text="Cancel"
+                            android:text="@android:string/cancel"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"/>
 
@@ -222,7 +222,7 @@
             android:focusable="true"
             app:backgroundTint="@color/red_500"
             android:visibility="visible"
-            android:contentDescription="End call"
+            android:contentDescription="@string/WebRtcCallScreen_end_call"
             tools:visibility="visible"/>
 
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e3e03304f1..5ed600faf0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -727,6 +727,9 @@
     <string name="WebRtcCallScreen_new_safety_numbers">The safety number for your conversation with %1$s has changed. This could either mean that someone is trying to intercept your communication, or that %2$s simply re-installed Signal.</string>
     <string name="WebRtcCallScreen_you_may_wish_to_verify_this_contact">You may wish to verify your safety number with this contact.</string>
     <string name="WebRtcCallScreen_new_safety_number_title">New safety number</string>
+    <string name="WebRtcCallScreen_accept">Accept</string>
+    <string name="WebRtcCallScreen_cancel">Cancel</string>
+    <string name="WebRtcCallScreen_end_call">End call</string>
 
     <!-- WebRtcCallControls -->
     <string name="WebRtcCallControls_tap_to_enable_your_video">Tap to enable your video</string>
@@ -1381,6 +1384,8 @@
     <string name="RegistrationActivity_verify_s">Verify %s</string>
     <string name="RegistrationActivity_please_enter_the_verification_code_sent_to_s">Please enter the verification code sent to %s.</string>
     <string name="RegistrationActivity_wrong_number">Wrong number?</string>
+    <string name="RegistrationActivity_call_me_instead">Call me instead</string>
+    <string name="RegistrationActivity_available_in">Available in:\u0020</string>
     <string name="BackupUtil_never">Never</string>
     <string name="BackupUtil_unknown">Unknown</string>
     <string name="prompt_passphrase_activity__unlock_signal">Unlock Signal</string>