diff --git a/briar-android/res/layout/briar_recycler_view.xml b/briar-android/res/layout/briar_recycler_view.xml
index 2f3d6fc5a..ad5012041 100644
--- a/briar-android/res/layout/briar_recycler_view.xml
+++ b/briar-android/res/layout/briar_recycler_view.xml
@@ -24,8 +24,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
+ android:gravity="center"
android:padding="@dimen/margin_activity_horizontal"
+ android:text="@string/no_data"
android:textSize="@dimen/text_size_large"
- android:text="@string/no_data"/>
+ tools:text="@string/no_contacts"/>
\ No newline at end of file
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 1618f97e3..0f3a8bd17 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -39,7 +39,7 @@
Settings
Sign Out
Contacts
- 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.
Add a Contact
Add a Contact - Step %1$d/%2$d
Choose the identity you want to use:
@@ -68,10 +68,12 @@
Authenticating with device\u2026
Connection aborted by us! This could mean that someone is trying to interfere with your connection
Connection aborted by your contact! This could mean that someone is trying to interfere with your connection
- No messages
+ No messages.
+ This is the conversation view.\n\nThere seems to be a lack of conversation.\n\nJust tap the input field at the bottom to start a conversation.
Type message
Message sent
- You don\'t have any forums.\n\nWhy don\'t you create a new one yourself or ask your contacts to share one with you?
+ You don\'t have any forums yet.\n\nWhy don\'t you create a new one yourself by tapping the + icon at the top?\n\nYou can also ask your contacts to share forums with you.
+ This forum is empty.\n\nUse the pen icon at the top to compose the first post.\n\nFeeling lonely here? Share this forum with more of your contacts!
- %d forum shared by contacts
- %d forums shared by contacts
@@ -116,7 +118,6 @@
Shared by
Shared with
Nobody
- You don\'t have any contacts. Add a contact now?
Add
Cancel
Done
diff --git a/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java b/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
index 95e892a97..6ae5c46d7 100644
--- a/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
+++ b/briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
@@ -44,7 +44,7 @@ public class ContactListAdapter
// date of last message
if (item.isEmpty()) {
- ui.date.setText(R.string.no_private_messages);
+ ui.date.setText(R.string.date_no_private_messages);
} else {
long timestamp = item.getTimestamp();
ui.date.setText(AndroidUtils.formatDate(ctx, timestamp));
diff --git a/briar-android/src/org/briarproject/android/forum/ForumActivity.java b/briar-android/src/org/briarproject/android/forum/ForumActivity.java
index 2657715b2..799805d2a 100644
--- a/briar-android/src/org/briarproject/android/forum/ForumActivity.java
+++ b/briar-android/src/org/briarproject/android/forum/ForumActivity.java
@@ -110,6 +110,7 @@ public class ForumActivity extends BriarActivity implements
(BriarRecyclerView) findViewById(R.id.forum_discussion_list);
linearLayoutManager = new LinearLayoutManager(this);
recyclerView.setLayoutManager(linearLayoutManager);
+ recyclerView.setEmptyText(getString(R.string.no_forum_posts));
recyclerView.showProgressBar();
forumController