commit 0374e4eb3eb7b3e13c0dbba2f44406024268156c
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Mon Jun 11 11:19:50 2018 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Fri Jun 15 16:59:30 2018 -0400
tree f87dde87f18948dd6d13b873a2bc005b61522557
parent 543579b13cc9a907cf014241a65cf3324803026d

conversation: change label to call for action

Change-Id: Ie7658956bf57602a8a386893ea810abca05d97db

ring-android/app/src/main/res/layout/frag_conversation.xml

diff --git a/ring-android/app/src/main/res/layout/frag_conversation.xml b/ring-android/app/src/main/res/layout/frag_conversation.xml
index 1d749ae..f102137 100644
--- a/ring-android/app/src/main/res/layout/frag_conversation.xml
+++ b/ring-android/app/src/main/res/layout/frag_conversation.xml
@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
-            android:text="@string/ongoing_call"
+            android:text="@string/conversation_action_go_to_call"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/text_color_primary" />
     </LinearLayout>

ring-android/app/src/main/res/values/strings.xml

diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
index 85674f6..8a6ffef 100644
--- a/ring-android/app/src/main/res/values/strings.xml
+++ b/ring-android/app/src/main/res/values/strings.xml
@@ -170,6 +170,7 @@
     <string name="conversation_action_copied_peer_number_clipboard">%1$s copied to clipboard</string>
     <string name="conversation_action_select_peer_number">Select a number</string>
     <string name="conversation_action_block_this">Block this contact</string>
+    <string name="conversation_action_go_to_call">Return to ongoing call</string>
 
     <!-- Contacts -->
     <string name="add_call_contact_number_to_contacts">Add %1$s ?</string>