Merge branch 'master' into fix_108
This commit is contained in:
commit
88213f1c39
79 changed files with 1317 additions and 238 deletions
|
|
@ -15,12 +15,8 @@
|
|||
<string name="no_reply_support">Sender doesn\'t support replies</string>
|
||||
<string name="draft">Draft</string>
|
||||
<string name="sending">Sending…</string>
|
||||
<string name="configure_notification">Configure Notification</string>
|
||||
|
||||
<!-- Configuration Settings -->
|
||||
<string name="configure_name_and_message">Name and Message</string>
|
||||
<string name="configure_name">Name</string>
|
||||
<string name="configure_no_details">No Details</string>
|
||||
<string name="export_messages">Export messages</string>
|
||||
<string name="import_messages">Import messages</string>
|
||||
|
||||
<!-- New conversation -->
|
||||
<string name="new_conversation">New conversation</string>
|
||||
|
|
@ -48,6 +44,11 @@
|
|||
<item quantity="other">%d messages</item>
|
||||
</plurals>
|
||||
|
||||
<!-- Settings -->
|
||||
<string name="lock_screen_visibility">Lock screen notification visibility</string>
|
||||
<string name="sender_and_message">Sender and message</string>
|
||||
<string name="sender_only">Sender only</string>
|
||||
|
||||
<!-- FAQ -->
|
||||
<string name="faq_1_title">Why does the app require access to the internet?</string>
|
||||
<string name="faq_1_text">Sadly it is needed for sending MMS attachments. Not being able to send MMS would be a really huge disadvantage compared to other apps, so we decided to go this way.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue