Merge branch 'master' into add-pin-conversation

This commit is contained in:
Tibor Kaputa 2021-09-24 18:34:15 +02:00 committed by GitHub
commit e92943b167
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 1604 additions and 23 deletions

View file

@ -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">为什么该应用需要访问互联网?</string>
<string name="faq_1_text">很遗憾这对于发送彩信附件是必须的。如果不能发送彩信的话这相比其他应用会是一个巨大的劣势,所以我们决定这么采取现在的方式。