Merge branch 'master' into dev-factory-reset

This commit is contained in:
Andre K 2022-08-25 20:39:53 -03:00 committed by GitHub
commit 7caa09b3a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 102 additions and 70 deletions

View file

@ -155,6 +155,7 @@
<string name="message">Message</string>
<string name="mode_append">Append to message</string>
<string name="mode_instant">Instantly send</string>
<string name="warning_default_psk">Empty channel names use the default encryption key (any device on %s can read your messages).</string>
<string name="factory_reset">Factory reset</string>
<string name="are_you_sure_factory_reset">Are you sure you want to factory reset?</string>
<string name="factory_reset_description">This will clear all device configuration you have done.</string>