diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index e339d7951db..20668001a92 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -43,7 +43,7 @@
android:layout_width="0dp"
android:layout_height="150dip"
android:layout_weight="1"
- android:contentDescription="Attachment Thumbnail"/>
+ android:contentDescription="@string/conversation_activity__attachment_thumbnail"/>
@@ -65,7 +65,7 @@
android:layout_width="20sp"
android:visibility="gone"
android:src="@drawable/ic_attachment_universal_small"
- android:contentDescription="Attachment Indicator" />
+ android:contentDescription="@string/conversation_list_item_view__attachment_indicator" />
+ android:contentDescription="@string/conversation_list_item_view__error_alert" />
+ android:contentDescription="@string/registration_progress_activity__alert"/>
+ android:contentDescription="@string/registration_progress_activity__telephone"/>
+ android:contentDescription="@string/registration_progress_activity__alert"/>
+ android:contentDescription="@string/registration_progress_activity__check"/>
+ android:contentDescription="@string/registration_progress_activity__check"/>
+ android:contentDescription="@string/registration_progress_activity__check"/>
+ android:contentDescription="@string/registration_progress_activity__check"/>
+ android:contentDescription="@string/transport_selection_list_item__transport_icon"/>
diff --git a/res/menu/conversation_insecure_no_push.xml b/res/menu/conversation_insecure_no_push.xml
index 7ba1e70a4a7..5c5b77c4dbc 100644
--- a/res/menu/conversation_insecure_no_push.xml
+++ b/res/menu/conversation_insecure_no_push.xml
@@ -1,6 +1,6 @@