Merge branch '1316-make-introduction-string' into 'master'

Use separate strings for introduction menu item and button

Closes #1316

See merge request akwizgran/briar!833

briar-android/src/main/res/menu/conversation_actions.xml

@@ -6,7 +6,7 @@
 	<item
 		android:id="@+id/action_introduction"
 		android:icon="@drawable/introduction_white"
-		android:title="@string/introduction_button"
+		android:title="@string/introduction_menu_item"
 		android:enabled="false"
 		app:showAsAction="never"/>
 

briar-android/src/main/res/values/strings.xml

@@ -143,6 +143,7 @@
 	<!-- Introductions -->
 	<string name="introduction_onboarding_title">Introduce your contacts</string>
 	<string name="introduction_onboarding_text">You can introduce your contacts to each other, so they don\'t need to meet in person to connect on Briar.</string>
+	<string name="introduction_menu_item">Make Introduction</string>
 	<string name="introduction_activity_title">Select Contact</string>
 	<string name="introduction_not_possible">You already have one introduction in progress with these contacts. Please allow for this to finish first. If you or your contacts are rarely online, this can take some time.</string>
 	<string name="introduction_message_title">Introduce Contacts</string>