Merge pull request #2182 from philipwhiuk/fixHardcodedText

Move hardcoded text to string resources
This commit is contained in:
Philip 2017-02-04 23:25:02 +00:00 committed by GitHub
commit 4564f57f01
3 changed files with 4 additions and 2 deletions

View file

@ -47,6 +47,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/crypto_warning_override"
android:text="Show message anyways"/>
android:text="@string/messageview_crypto_warning_show_anyway"/>
</LinearLayout>

View file

@ -58,6 +58,6 @@
android:title="@string/from_same_sender" />
<item
android:id="@+id/debug_delete_locally"
android:title="Debug / Clear message body"
android:title="@string/debug_delete_local_body"
/>
</menu>

View file

@ -291,6 +291,7 @@ Please submit bug reports, contribute new features and ask questions at
<string name="message_additional_headers_retrieval_failed">The retrieval of additional headers from the database or mail server failed.</string>
<string name="from_same_sender">More from this sender</string>
<string name="debug_delete_local_body">Debug / Clear message body</string>
<string name="message_discarded_toast">Message discarded</string>
<string name="message_saved_toast">Message saved as draft</string>
@ -1201,6 +1202,7 @@ Please submit bug reports, contribute new features and ask questions at
<string name="messageview_crypto_warning_insecure">This message was signed by an <b>insecure key!</b></string>
<string name="messageview_crypto_warning_error">There was an <b>error in this message\'s signature!</b></string>
<string name="messageview_crypto_warning_unsigned">This message was encrypted, but not signed. It is <b>not end-to-end secure</b>!</string>
<string name="messageview_crypto_warning_show_anyway">Show message anyway</string>
<string name="recipient_error_non_ascii">Special characters are currently not supported!</string>
<string name="recipient_error_parse_failed">Error parsing address!</string>
<string name="account_settings_crypto_support_sign_only">Support signing of unencrypted messages</string>