Merge branch 'master' into add-pin-conversation
This commit is contained in:
commit
e92943b167
47 changed files with 1604 additions and 23 deletions
|
|
@ -15,8 +15,6 @@
|
|||
<string name="no_reply_support">Sender doesn\'t support replies</string>
|
||||
<string name="draft">Draft</string>
|
||||
<string name="sending">Sending…</string>
|
||||
<string name="export_messages">Export messages</string>
|
||||
<string name="import_messages">Import messages</string>
|
||||
<string name="pin_conversation">Pin to the top</string>
|
||||
<string name="unpin_conversation">Unpin</string>
|
||||
|
||||
|
|
@ -55,6 +53,17 @@
|
|||
<string name="mms_file_size_limit">Resize sent MMS images</string>
|
||||
<string name="mms_file_size_limit_none">No limit</string>
|
||||
|
||||
<!-- Export / Import -->
|
||||
<string name="messages">Messages</string>
|
||||
<string name="export_messages">Export messages</string>
|
||||
<string name="export_sms">Export SMS</string>
|
||||
<string name="export_mms">Export MMS</string>
|
||||
<string name="export_unchecked_error_message">Check at least one of Export SMS or Export MMS</string>
|
||||
<string name="import_messages">Import messages</string>
|
||||
<string name="import_sms">Import SMS</string>
|
||||
<string name="import_mms">Import MMS</string>
|
||||
<string name="import_unchecked_error_message">Check at least one of Import SMS or Import MMS</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