Conflicts UI touch-ups:

1) Fix i18n and layout naming.
2) Error header for message details.
3) Add back button to message details.

// FREEBIE

Closes #2593
This commit is contained in:
Jake McGinty
2015-02-27 11:07:20 -08:00
committed by Moxie Marlinspike
parent 3f93731300
commit ac0a1c0bc1
6 changed files with 101 additions and 64 deletions

View File

@@ -544,6 +544,10 @@
<!-- media_overview_activity -->
<string name="media_overview_activity__no_images">No images</string>
<!-- message_recipients_list_item -->
<string name="message_recipients_list_item__verify">VERIFY</string>
<string name="message_recipients_list_item__resend">RESEND</string>
<!-- MmsPreferencesFragment -->
<string name="MmsPreferencesFragment__manual_mms_settings_are_required">Manual MMS settings are required for your phone.</string>
<string name="MmsPreferencesFragment__enabled">Enabled</string>
@@ -658,6 +662,7 @@
<string name="verify_identity_activity__your_identity_you_read">Your identity (you read):</string>
<!-- message_details_header -->
<string name="message_details_header__issues_need_your_attention">Some issues need your attention.</string>
<string name="message_details_header__sent">Sent</string>
<string name="message_details_header__received">Received</string>
<string name="message_details_header__via">Via</string>