diff --git a/res/values/strings.xml b/res/values/strings.xml
index 87ff16b3b2..76e6ddf7a9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,13 +47,13 @@
Message size: %d KB
Expires: %s
Error sending message
- Saving Attachment
+ Saving attachment
Saving attachment to SD card...
- Save to SD Card?
+ Save to SD card?
This media has been stored in an encrypted database. The version you save to the SD card will no longer be encrypted. Would you like to continue?
Error while saving attachment to SD card!
Success!
- Unable to write to SD Card!
+ Unable to write to SD card!
View secure media?
This media has been stored in an encrypted database. Unfortunately, to view it with an external content viewer currently requires the data to be temporarily decrypted and written to disk. Are you sure that you would like to do this?
Received and processed key exchange message.
@@ -70,28 +70,28 @@
This message will not be encrypted because a secure session could not be established.\n\nSend insecure message?
- Initiate Secure Session?
+ Initiate secure session?
Initiate secure session with %s?
- End Secure Session Confirmation
+ End secure session confirmation
Are you sure that you want to end this secure session?
- Delete Thread Confirmation
+ Delete thread confirmation
Are you sure that you want to permanently delete this conversation?
Add attachment
Select contact info
- Compose Message
+ Compose message
Sorry, there was an error setting your attachment.
Sorry, the selected video exceeds message size restrictions.
Sorry, the selected audio exceeds message size restrictions.
Recipient is not a valid SMS or email address!
Message is empty!
- Group Conversation Recipients
- Group Conversation
- Unnamed Group
+ Group conversation recipients
+ Group conversation
+ Unnamed group
%d members
1 member
Saved draft
Invalid recipient!
- Calls Not Supported
+ Calls not supported
This device does not appear to support dial actions.
Leave group?
Are you sure you want to leave this group?
@@ -100,8 +100,8 @@
Message details
Transport: %1$s\nSent/Received: %2$s
Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived: %4$s
- Confirm Message Delete
- Are you sure that you want to permanently delete this message?
+ Confirm message delete
+ Are you sure that you want to permanently delete this message?
Key exchange message...
@@ -119,12 +119,12 @@
Share with
- Export To SD Card?
+ Export To SD card?
This
will export your encrypted keys, settings, and messages to the SD card.
Export
- Export Plaintext To SD Card?
+ Export plaintext to SD card?
Warning, this will
export the plaintext contents of your TextSecure messages to the SD card.
@@ -143,37 +143,37 @@
- New Group
- Update Group
- Group Name
- New MMS Group
+ New group
+ Update group
+ Group name
+ New MMS group
You have selected a contact that doesn\'t support TextSecure groups, so this group will be MMS.
You\'re not registered for using the data channel, so TextSecure groups are disabled.
An unexpected error happened that has made group creation fail.
You need at least one person in your group!
One of the members of your group has a number that can\'t be read correctly. Please fix or remove that contact and try again.
File I/O error, couldn\'t create a temporary image file.
- Group Avatar
- Create Group
+ Group avatar
+ Create group
Creating %1$s…
Cannot add non-TextSecure contacts to an existing TextSecure group
- Import System SMS Database?
+ Import system SMS database?
This will import
messages from the system\'s default SMS database to TextSecure. If you\'ve previously
imported the system\'s SMS database, importing again will result in duplicated messages.
Import
Cancel
- Restore Encrypted Backup?
+ Restore encrypted backup?
Restoring an encrypted backup will completely replace your existing keys, preferences, and
messages. You will lose any information that\'s in your current TextSecure install but not
in the backup.
Restore
- Import Plaintext Backup?
+ Import plaintext backup?
This will import
messages from a plaintext backup. If you\'ve previously imported this backup,
importing again will result in duplicated messages.
@@ -198,13 +198,13 @@
Error reading wireless provider MMS settings...
- Multimedia Message
+ Multimedia message
Received a message encrypted using an old version of TextSecure that is no longer supported. Please ask the sender to upgrade to the most recent version and resend the message.
- Passphrases Don\'t Match!
+ Passphrases don\'t match!
Incorrect old passphrase!
@@ -219,7 +219,7 @@
You must specify an MMSC URL for your carrier.
- MMS Settings Updated
+ MMS settings updated
You can modify these values from the TextSecure settings menu at any time.
@@ -240,7 +240,7 @@
Connect With TextSecure
- Select Your Country
+ Select your country
You must specify your
country code
@@ -255,7 +255,7 @@
Sorry,
this device is not supported for data messaging. Devices running versions of Android older
than 4.0 must have a registered Google Account. Devices running Android 4.0 or newer do not
- require a Google Account, but must have the Play Store app installed.
+ require a Google account, but must have the Play Store app installed.
We will now verify that the following number is associated with this device:\n\n%s\n\n
@@ -265,7 +265,7 @@
Edit
- Possible Problems
+ Possible problems
Verifying number
@@ -275,26 +275,26 @@
You must enter the code you received first...
Connecting
Connecting for verification...
- Network Error!
+ Network error!
Unable to connect. Please check your network connection and try again.
- Verification Failed!
+ Verification failed!
The verification code you submitted is incorrect. Please try again.
Too many attempts
You\'ve submitted an incorrect verification code too many times. Please wait a minute before trying again.
- Requesting Call
+ Requesting call
Requesting incoming verification call...
- Server Error
+ Server error
The server encountered an error. Please try again.
- Too Many Requests!
+ Too many requests!
You\'ve already recently requested a voice call. You can request another in 20 minutes.
Verifying voice code...
Registration conflict
This number is already registered on a different TextSecure server (CyanogenMod?). You must unregistering there before registering here.
- Registration Complete
+ Registration complete
TextSecure registration has successfully completed.
- Registration Error
+ Registration error
TextSecure registration has encountered a problem.
@@ -331,7 +331,7 @@
Get my fingerprint scanned
Scan their fingerprint
WARNING, the scanned key DOES NOT match! Please check the fingerprint text carefully.
- NOT Verified!
+ NOT verified!
Their key is correct. It is also necessary to get your fingerprint scanned as well.
Verified!
@@ -340,14 +340,14 @@
Scan to compare
Get scanned to compare
WARNING, the scanned key DOES NOT match!
- NOT Verified!
+ NOT verified!
The scanned key matches!
Verified!
- Identity Fingerprint
- My Identity Fingerprint
+ Identity fingerprint
+ My identity fingerprint
- Initiate Despite Existing Request?
+ Initiate despite existing request?
You\'ve already sent a session initiation request to this recipient, are you sure you\'d like to send another? This will invalidate the first request.
Send
@@ -359,7 +359,7 @@
Connecting to MMS server...
Downloading MMS...
- MMS Download failed!
+ MMS download failed!
Downloading...
Tap and configure MMS settings to continue download.
@@ -373,7 +373,7 @@
Import in progress
- Importing Text Messages
+ Importing text messages
Touch to open.
@@ -385,7 +385,7 @@
%d new messages
Most recent from: %s
Encrypted message...
- (No Subject)
+ (No subject)
Message delivery failed.
Failed to deliver message.
Error delivering message.
@@ -398,7 +398,7 @@
key...
Regenerated!
- Reset Identity Key?
+ Reset identity key?
Caution! By regenerating your identity key, your current identity key will be permanently lost,
and your existing contacts will receive warnings when establishing new secure sessions with you.
@@ -415,7 +415,7 @@
You have received a message from someone who supports TextSecure encrypted sessions. Would you like to initiate a secure session?
- Initiate Exchange
+ Initiate exchange
OLD PASSPHRASE:
@@ -446,9 +446,9 @@
Remove
- Media Message
- Play Button
- Secure Message Indicator
+ Media message
+ Play button
+ Secure message indicator
Download
@@ -462,7 +462,7 @@
Downloading
- Batch Selection Mode
+ Batch selection mode
Loading countries...
@@ -501,28 +501,28 @@
IMPORTING
- Updating Database...
+ Updating database...
- Export Encrypted Backup
+ Export encrypted backup
Export an encrypted
backup to the SD card.
- Export Plaintext Backup
+ Export plaintext backup
Export a plaintext backup compatible with \'SMSBackup And Restore\' to the SD card.
- Import System SMS Database
+ Import system SMS database
Import the database
from the default system messenger app.
- Import Encrypted Backup
+ Import encrypted backup
Restore a previously exported encrypted TextSecure backup.
- Import Plaintext Backup
+ Import plaintext backup
Import a plaintext backup file. Compatible with \'SMSBackup And Restore.\'
- Regenerate Key
+ Regenerate key
Manual MMS settings are required for your phone.
@@ -559,7 +559,7 @@
Some possible problems
include:
- SMS Interceptors.
+ SMS interceptors.
Some third party text messaging clients, such as Handcent or GoSMS, behave poorly and
intercept all incoming SMS messages. Check to see if you received a text message that starts
@@ -577,13 +577,13 @@
- Voice Verification
+ Voice verification
TextSecure can also call you to verify your number. Tap \'Call Me\' and enter the six digit
code that you hear below.
Verify
- Call Me
+ Call me
Edit number
Connectivity error.
@@ -597,12 +597,12 @@
Your
device needs network connectivity in order to use this TextSecure feature. Check to ensure
- that it is connected to 3G or Wifi.
+ that it is connected to 3G or Wi-Fi.
Restrictive firewall.
- If you are connected via wifi, it\'s possible that there is a firewall blocking access to
+ If you are connected via Wi-Fi, it\'s possible that there is a firewall blocking access to
the TextSecure server. Try another network or mobile data.
@@ -646,24 +646,23 @@
You read this:
-
- Create Passphrase
+ Create passphrase
Enter passphrase
- Select Contacts
- Select Contact
- TextSecure Detected
- Public Identity Key
- Change Passphrase
- Verify Session
- Verify Identity
- Manage Identity Keys
- Complete Key Exchange
- Submit Debug Logs
+ Select contacts
+ Select contact
+ TextSecure detected
+ Public identity key
+ Change passphrase
+ Verify session
+ Verify identity
+ Manage identity keys
+ Complete key exchange
+ Submit debug logs
Import / Export
- My Identity Key
- Contact Keys
+ My identity key
+ Contact keys
General
@@ -674,11 +673,11 @@
Use TextSecure for viewing and storing all incoming multimedia messages
Input Settings
Enable Enter key
- Replace the smiley key with an enter key
- Enter sends
- Pressing the enter key will send text messages
- Display Settings
- Choose Identity
+ Replace the smiley key with an Enter key
+ Enter key sends
+ Pressing the Enter key will send text messages
+ Display settings
+ Choose identity
Choose your contact entry from the contacts list.
Change passphrase
Change my passphrase
@@ -690,7 +689,7 @@
Disable screen security to allow screen shots
Forget passphrase from memory after some interval
Timeout passphrase
- Select Passphrase Timeout
+ Select passphrase timeout
Timeout interval
The amount of time to wait before forgetting passphrase from memory
Identity keys
@@ -701,9 +700,9 @@
Display message notifications in status bar
LED color
LED blink pattern
- Set custom LED Blink Pattern
- On For:
- Off For:
+ Set custom LED blink pattern
+ On for:
+ Off for:
Custom LED blink pattern set!
Sound
Change notification sound
@@ -727,8 +726,8 @@
Custom
Advanced
Passphrase
- MMS Preferences
- Enable Manual MMS
+ MMS preferences
+ Enable manual MMS
Override system MMS settings with the information below.
MMSC URL (Required)
MMS Proxy Host (Optional)
@@ -741,8 +740,8 @@
Conversation length limit
Trim all threads now
Scan through all conversation threads and enforce conversation length limits
- Light Theme
- Dark Theme
+ Light theme
+ Dark theme
Appearance
Theme
Default
@@ -755,7 +754,7 @@
Allow outgoing SMS to
TextSecure is currently your default SMS app. Please set another default SMS app first to change this preference.
- Refresh Push Directory
+ Refresh push directory
Submit debug log
TextSecure users
(ask first)
@@ -769,8 +768,8 @@
- Select All
- Unselect All
+ Select all
+ Unselect all
TEXTSECURE USERS
ALL CONTACTS
New message to...
@@ -779,7 +778,7 @@
Finished
- Refresh Contact List
+ Refresh contact list
Send unencrypted
@@ -795,11 +794,11 @@
Resend message
- Start Secure Session
+ Start secure session
- Delete Selected
- Select All
+ Delete selected
+ Select all
Search
@@ -808,14 +807,14 @@
Security
- No Identity Available
- Verify Identity
- End Secure Session
+ No identity available
+ Verify identity
+ End secure session
Add attachment
- Update Group
- Leave Group
+ Update group
+ Leave group
Add contact info
Delete thread
@@ -834,11 +833,11 @@
Unlock
- New Message
- New Group
+ New message
+ New group
Settings
Lock
- Mark All Read
+ Mark all read
Verified