diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 51437478e..9794b8e09 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -17,7 +17,6 @@
#ff9e9e9e
#ff424242
#ff282828
- #fff44336
#ffc62828
#ffff9800
#ff259b24
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 379a7eb95..39234304e 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -5,6 +5,5 @@
16dp
8dp
11sp
- 24dp
32dp
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 9c3575fdf..5e86ca708 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -70,7 +70,6 @@
The contact is not in your roster. Would you like to add it?
Add contact
delivery failed
- rejected
Preparing image for transmission
Preparing images for transmission
Sharing files. Please wait…
@@ -127,14 +126,11 @@
Let your contacts know when you have received and read their messages
UI
OpenKeychain reported an error
- I/O Error decrypting file
Accept
An error has occurred
Grant presence updates
Preemptively grant and request presence subscriptions for contacts you have created
- Subscriptions
Your account
- Keys
Send presence updates
Receive presence updates
Ask for presence updates
@@ -166,7 +162,6 @@
OTR
OpenPGP
OMEMO
- Edit account
Delete account
Temporarily disable
Publish avatar
@@ -190,14 +185,6 @@
This is not a valid Jabber ID
Out of memory. Image is too large
Do you want to add %s to your address book?
- online
- free to chat
- away
- extended away
- do not disturb
- offline
- Conference
- Other Members
Server info
XEP-0313: MAM
XEP-0280: Message Carbons
@@ -218,11 +205,9 @@
last seen %d hours ago
last seen 1 day ago
last seen %d days ago
- never seen
Encrypted message. Please install OpenKeychain to decrypt.
Unknown OTR fingerprint
OpenPGP encrypted messages found
- Reception failed
Your fingerprint
OTR fingerprint
OTR fingerprint of message
@@ -255,7 +240,6 @@
Save as bookmark
Delete bookmark
This bookmark already exists
- You
Edit conference subject
The subject of this conference
Joining conference…
@@ -279,14 +263,11 @@
This account already exists
Next
Current session established
- Additional Information
Skip
Disable notifications
- Disable notifications for this conversation
Enable
Conference requires password
Enter password
- Missing presence updates from contact
Missing presence subscription
Please request presence updates from your contact first.\n\nThis will be used to determine what client(s) your contact is using.
Request now
@@ -295,12 +276,8 @@
Ignore
Warning: Sending this without mutual presence updates could cause unexpected problems.\n\nGo to contact details to verify your presence subscriptions.
Security
- Force end-to-end encryption
- Always send messages encrypted (except for conferences)
Allow message correction
Allow your contacts to retroactively edit their messages
- Don’t save encrypted messages
- Warning: This could lead to message loss
Expert settings
Please be careful with these
About Conversations
@@ -371,24 +348,18 @@
Copy original URL
Send again
File URL
- Message text
URL copied to clipboard
- Message copied to clipboard
- Image transmission failed
Scan 2D Barcode
Show 2D Barcode
Show block list
Account details
Verify OTR
Remote Fingerprint
- scan
- Socialist Millionaire Protocol
Hint or Question
Shared Secret
Confirm
In progress
Respond
- Failed
Secrets do not match
Try again
Finish
@@ -420,16 +391,12 @@
Show dynamic tags
Display read-only tags underneath contacts
Enable notifications
- Create conference with…
No conference server found
Conference creation failed!
- Secret accepted!
- Reset
Account avatar
Copy OTR fingerprint to clipboard
Copy OMEMO fingerprint to clipboard
Regenerate OMEMO key
- Wipe other devices from PEP
Clear devices
Are you sure you want to clear all other devices from the OMEMO announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime.
There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contacts server.
@@ -503,7 +470,6 @@
Sending %s
Offering %s
Hide offline
- Disable Account
%s is typing…
%s has stopped typing
%s are typing…
@@ -544,14 +510,10 @@
Username
Username
This is not a valid username
- Conference name
- This is not a valid conference name
Download failed: Server not found
Download failed: File not found
Download failed: Could not connect to host
Download failed: Could not write file
- Use white background
- Show received messages as black text on a white background
Tor network unavailable
Bind failure
Server not responsible for domain
@@ -760,6 +722,6 @@
Validate hostname with DNSSEC
Server certificates that contain the validated hostname are considered verified
Network is unreachable
- Certificate does not contain a Jabber ID
- partial
+ Certificate does not contain a Jabber ID
+ partial