Merge branch 'master' into feat/export-sms

# Conflicts:
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
This commit is contained in:
darthpaul 2021-09-18 22:16:12 +01:00
commit a5109da19f
44 changed files with 565 additions and 54 deletions

View file

@ -47,6 +47,9 @@
<string name="sender_and_message">Sender and message</string>
<string name="sender_only">Sender only</string>
<string name="enable_delivery_reports">Enable delivery reports</string>
<string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
<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>