Use Inheritence for shared Forum and Blog Sharing Code

briar-android/res/layout/list_item_shareable_invitation_in.xml

@@ -37,13 +37,13 @@
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
 			android:layout_alignEnd="@+id/introductionText"
 			android:layout_alignRight="@+id/introductionText"
-			android:layout_below="@+id/showForumsButton"
+			android:layout_below="@+id/showInvitationsButton"
 			android:textColor="@color/private_message_date"
 			android:textSize="@dimen/text_size_tiny"
 			tools:text="Dec 24, 13:37"/>
 
 		<Button
-			android:id="@+id/showForumsButton"
+			android:id="@+id/showInvitationsButton"
 			style="@style/BriarButtonFlat.Positive"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
 			android:layout_alignEnd="@+id/introductionText"
 			android:layout_alignRight="@+id/introductionText"
 			android:layout_below="@+id/introductionText"
-			android:text="@string/forum_show_invitations"/>
+			tools:text="@string/forum_show_invitations"/>
 
 	</RelativeLayout>
 

briar-android/res/menu/blogs_blog_actions.xml

@@ -11,7 +11,7 @@
 
 	<item
 		android:id="@+id/action_blog_sharing_status"
-		android:title="@string/forum_sharing_status"
+		android:title="@string/sharing_status"
 		app:showAsAction="never"/>
 
 </menu>

briar-android/res/menu/forum_actions.xml

@@ -17,7 +17,7 @@
 
 	<item
 		android:id="@+id/action_forum_sharing_status"
-		android:title="@string/forum_sharing_status"
+		android:title="@string/sharing_status"
 		app:showAsAction="never"/>
 
 	<item

briar-android/res/values-pt-rBR/strings.xml

@@ -79,7 +79,7 @@
   <string name="show_forums">Mostrar</string>
   <string name="forum_leave">Sair do fórum</string>
   <string name="forum_left_toast">Saiu do fórum</string>
-  <string name="forum_sharing_status">Status de compartilhamento</string>
+  <string name="sharing_status">Status de compartilhamento</string>
   <string name="no_posts">Sem Posts</string>
   <plurals name="unread_posts">
     <item quantity="one">%d post não lido</item>

briar-android/res/values/strings.xml

@@ -53,6 +53,7 @@
 	<string name="now">now</string>
 	<string name="contact_list_title">Contacts</string>
 	<string name="no_contacts">It seems that you are new here and have no contacts yet.\n\nTap the + icon at the top and follow the instructions to add some friends to your list.\n\nPlease remember: You can only add new contacts face-to-face to prevent anyone from impersonating you or reading your messages in the future.</string>
+	<string name="no_contacts_selector">It seems that you are new here and have no contacts yet.\n\nPlease come back here after you added your first contact.</string>
 	<string name="add_contact_title">Add a Contact</string>
 	<string name="your_nickname">Choose the identity you want to use:</string>
 	<string name="face_to_face">You must be face-to-face with the person you want to add as a contact. This will prevent anyone from impersonating you or reading your messages in future.</string>
@@ -95,7 +96,7 @@
 	<string name="show_forums">Show</string>
 	<string name="forum_leave">Leave Forum</string>
 	<string name="forum_left_toast">Left Forum</string>
-	<string name="forum_sharing_status">Sharing Status</string>
+	<string name="sharing_status">Sharing Status</string>
 	<string name="no_posts">No posts</string>
 	<plurals name="unread_posts">
 		<item quantity="one">%d unread post</item>
@@ -266,7 +267,7 @@
 	<string name="settings_toolbar_header">Settings</string>
 	<string name="contacts_toolbar_header">Contacts</string>
 	<string name="forums_toolbar_header">Forums</string>
-	<string name="forums_share_toolbar_header">Choose Contacts</string>
+	<string name="activity_share_toolbar_header">Choose Contacts</string>
 	<!-- Progress titles -->
 	<string name="progress_title_logout">Signing out of Briar..</string>
 	<string name="progress_title_please_wait">Please wait..</string>
@@ -317,7 +318,7 @@
 	<string name="blogs_sharing_invitation_sent">You have shared the personal blog of %1$s with %2$s.</string>
 	<string name="blogs_sharing_show_invitations">Show Blog Invitations</string>
 	<string name="blogs_sharing_invitations_title">Blog Invitations</string>
-	<string name="blogs_sharing_exists">You are subscribed to this blog already.\nWarning: Accepting again might reveal that %s is your contact.</string>
+	<string name="blogs_sharing_exists">You are subscribed to this blog already. Accepting again can lead to faster blog post delivery.</string>
 	<string name="blogs_sharing_joined_toast">Subscribed to Blog</string>
 	<string name="blogs_sharing_declined_toast">Blog Invitation Declined</string>