diff --git a/README.md b/README.md
index 73cd93b..1bec568 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
> Make the world connect freely!
-Tok was born with the sole mission of making our communication easier via modern technology. We assume that you would use Tok to share personal or special moments with extreme privacy, so we adopt peer-to-peer communication, end-to-end encryption in our application, which ensure your information with absolute privacy.
+Tok was born with the sole mission of making our communication easier via modern technology. We assume that you would use Tok to share personal or special moments with extreme privacy, so we adopt peer-to-peer communication, end-to-end encryption in our app, which ensures your information absolute privacy.
Tok website: [**https://www.tok.life**](https://www.tok.life)
@@ -20,7 +20,7 @@ Google Play: [https://play.google.com/store/apps/details?id=com.client.tok](http
- Audio filtering
- Audio notifications
- Avatars
-- Changing nospam
+- Changing NoSpam
- Chat logs
- Contact aliases
- File transfer
@@ -31,27 +31,27 @@ Google Play: [https://play.google.com/store/apps/details?id=com.client.tok](http
- Save file encryption
## Note
-set your own Key when you want to build a release apk
+Set your own key when you want to build a release APK.
## FAQ
You can find answers to a number of frequently asked questions on our [FAQ](https://www.tok.life/) site.
## Contributing Bug reports
-We use GitHub for bug tracking. Please search the existing issues for your bug and create a new one if the issue is not yet tracked!
+We use GitHub for bug tracking. Please search through the existing issues for your bug, and create a new one if it is not yet tracked.
Issues: [https://github.com/InsightIM/Tok-Android/issues](https://github.com/InsightIM/Tok-Android/issues)
## Contributing Ideas
-Have something you want to say about Tok or want to be part of the conversation? Connect us please!
+Something to say about Tok or want to be part of the conversation? Please do!
-website: [https://www.tok.life/](https://www.tok.life/)
+Website: [https://www.tok.life/](https://www.tok.life/)
-twitter: [https://twitter.com/TokMessenger](https://twitter.com/TokMessenger)
+Twitter: [https://twitter.com/TokMessenger](https://twitter.com/TokMessenger)
-facebook: [https://www.facebook.com/TokMessenger](https://www.facebook.com/TokMessenger)
+Facebook: [https://www.facebook.com/TokMessenger](https://www.facebook.com/TokMessenger)
-reddit: [https://www.reddit.com/r/TokMessenger/](https://www.reddit.com/r/TokMessenger/)
+Reddit: [https://www.reddit.com/r/TokMessenger/](https://www.reddit.com/r/TokMessenger/)
Tok ID: D1BCA4E4D9C620FE0BF815D8C8A2317AF79266F5F2750B909ED2BABDF6AC6264741BACF56B53
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8b067a0..4559be8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,26 +13,26 @@
Camera
Storage
Contacts
- Our app requires %1$s]]> access to function normally. Please enable %2$s]]> services in Settings.
+ %1$s]]> access required, grant %2$s]]> services in the system settings.
Create Account
Username
Password
- Login
- Logout
- Please input your user name!
- Please input your password!
- Sorry, the user %1$s Not Exist,Please check it!
+ Log in
+ Log out
+ Username.
+ Password.
+ Could not find the user %1$s.
Confirm
Cancel
Oops
- Import Account >
+ Import Account
Select File
Select Folder
- The chosen file is not a valid Tok/Tox profile
- User already exists, please login!
- Sorry, create Account Failed
- Sorry, import file Failed
+ That is not a valid Tok/Tox profile
+ User already exists, please log in.
+ Could not create account
+ Could not import file
Message
Contacts
Mine
@@ -44,61 +44,61 @@
Busy
My Tok ID
Security and Privacy
- About Tok
- Setting
+ About
+ Settings
My Tok ID
Group Tok ID
Tok ID
Copy
- Copy Success
+ Copied
Add Friends
- Confirm Add Friends
- Please input your friend\'s Tok ID
- Tok ID is invalid,Please check again!
+ Confirm Adding Friends
+ Please type in your friend\'s Tok ID
+ This is not a Tok ID.
You cannot add yourself
Friend added already
Hey! I\'m %1$s
- Add friend request has send
- Input your message
- Add friends in Tok ID
+ Friend request sent
+ Type your message
+ Add friends via Tok ID
Invite friends
Scan
- Put the qr code into the box and it will scan automatically
- Didn\'t found QR code
+ Put the QR code into frame, and it will scan
+ Could not find QR code
Account Info
Account Name
Export Profile
Exported data file to %s
- Error: Could not export data file.
+ Could not export data file.
https://fir.im/tokandroid
- New friends request
+ New friend request
Group
- Refuse
+ Discard
Accept
Share with
Request Message
Friend Accepted
- Sorry, failed. Please try again!
- Successful
+ Please try again.
+ Success
Send
- I\'m %1$s,I\'m using Tok,and my Tok ID is:%2$s
- I\'m %1$s,I\'m using Tok,and my group Tok ID is:%2$s
+ I\'m %1$s,I\'m using Tok, and my Tok ID is:%2$s
+ I\'m %1$s,I\'m using Tok, and my group Tok ID is:%2$s
Version:%1$s
- Personal information
- Friend information
+ Personal info
+ Friend info
Avatar
Nickname
Bio
Username: %1$s
- Group NickName: %1$s
+ Group Nickname: %1$s
Your friend is online
Your friend is offline
- Please input your message!
- Something is wrong with the File or Folder which your selected,Try again!
- Sorry, send file need your friend online!
+ Please type in your message.
+ Invalid file or folder selected, try again.
+ Your friend has to be online to receive files.
Create Group
My Group
Group Info
@@ -108,33 +108,33 @@
Add Member
Remove Member
Group ID
- Please input your group name!
- Please select group members!
+ Please type in your group name.
+ Please select group members.
Rename
Edit
Members (%1$s)
Delete Group
Delete %1$s
- Member Edit
+ Edit Members
Choose Member
- Choose one friend at least, please
+ Choose at-least one friend
Select
- Input message is same to origin message!
+ The message didn\'t change.
Tok
- Tok is running
- Sorry, file not exist
- Sorry, file play failed!
+ Tok running
+ The file does not exist.
+ Could not play file.
%1$s″
Group%1$s
- Tok Group, talk free
- Scan content invalid
- Scan not support Group
+ Tok Group, talk freely
+ Could not scan content
+ Cannot scan groups
More
- invitation has sent
+ Invitation sent
Yesterday
Delete
- Mark Readed
+ Mark as Read
%1$s%%
[Photo]
[File]
@@ -150,95 +150,97 @@
Release to Send
Release to Cancel
Slide to Cancel
- Slide up to Cancel
+ Slide upwards to Cancel
Username
- Alias Name
- Profile Edit
+ Nickname
+ Edit Profile
Save
- Send message need your friend or OfflineBot online
+ Your friend or the OfflineBot must be online to send a message.
Album
Camera
Edit Avatar
- Clipping Image
- Clip
- Hi! Welcome to %1$s
+ Crop Image
+ Crop
+ Hi, welcome to %1$s
Add Contact
Remove and Leave
OK
- Confirm Remove?
- Peer-to-peer communication, end-to-end encryption, click for more information>
- Messages to this chat and calls are now secured with peer-to-peer communication, end-to-end encryption. Tap for more information >
- Secure chat, no third party listen in
- tok_safe.html
- Make the world connect freely!
- https://www.tok.life?#%1$s#
- Hello,I\'m %1$s
I\'m in Tok,peer-to-peer encrypted chat!]]>
- Peer-to-peer encrypted chat, I\'m in Tok, click https://www.tok.life,free download Tok app. If you installed it, please copy this text $%1$s$, open Tok can add me as friends
- Share by Text
- Share by Image
- Long press this picture a minute, extract the QR code, download the app\n Open Tok and scan this QR code, add me as a friend
+ Confirm removal?
+ Peer-to-peer communication, end-to-end encryption, click for more info
+ Messages to this chat and calls are now peer-to-peer, secured with end-to-end encryption. Tap for more info.
+ Secure chat, no third party listening in.
+
+ tok_safe.html
+ https://www.tok.life?#%1$s#
+
+ The world connected freely.
+ Hello, I\'m %1$s
I\'m in Tok, peer-to-peer encrypted chat.]]>
+ Peer-to-peer encrypted chat, I\'m in Tok, click https://www.tok.life, to download the (copyleft) Tok app, and then copy this text $%1$s$, into it to add me.
+ Share via Text
+ Share via Image
+ Long press this picture, extract the QR code, download the app\nOpen Tok and scan this QR code to add me.
Scan the QR code to add me on Tok
- Add Friend Request
- Tok:ID
- Do not require any Phone number
- automatically generate random super-long ID, does not associate any real-name information
+ Friend Request
+ Tok:ID
+ Does not require a phone number
+ auto generate a random super-long ID. It is not associate with any real-name info.
invisible IP
- Hidden IP address by onion routing, unable to track your location
- peer-to-peer encrypted message
- automatically generates super-long key, it takes 9.9 billions years to violently crack-copy version
+ Hidden IP address via Tor onion routing
+ Peer-to-peer encrypted message
+ Auto generates a super-long key, taking an average 9.9 billion years to brute force.
Enter the Tok
- Repeat Password
- The input cannot exceed %1$s characters
+ Repeat
+ Use fewer than %1$s characters
Select your Tok/Tox profile
Clear Chat History
Delete Profile
%1$s has been stored in\n%2$s
Check
- File Check
+ Check File
Clear all message history?
- Delete this profile?\nThis operation will delete your account and cannot be undone
- Clear all messages when logout
- When you logout,\nit will clear all messages automatically
- No new friends request
+ Delete this profile?\nYou will not be able to recover your account.
+ Clear all messages upon logging out?
+ When you log out,\nall messages will be deleted.
+ No new friend requests
Resend
Public Key
FindFriendBot
Add Bot
- bot_list.json
- NEW
+ bot_list.json
+ NEW
- Sorry, username or password error!
+ Wrong username or password.
Setting password
Change Password
Done
- Original password
+ Password
New password
- Repeat password
- Enter original password
- Enter password
- Enter new password
- Enter new password again
- Password error
+ Repeat new password
+ Type in your password
+ Type in your password
+ Type the new password
+ Repeat the new password
+ Wrong password
Password
- New password is empty
- Password is not match
- Username can\'t contains /
+ You did not type in the new password.
+ The passwords do not match.
+ Username can\'t contain /
Failed
Reset Tox ID
Reset
- Password is required to encrypt your data
+ Password required to encrypt your data
Import Account
Auto receive files
- Resetting your Tox ID changes your ID permanently. You will keep your current contacts list, but other people won\'t be able to add you using your old ID.
+ Resetting your Tox ID changes your ID permanently. Your contacts are kept, and nobody can add you via your old Tok ID.
Contact us
Tok user
@@ -248,33 +250,32 @@
New Message Alerts
New Friend Request Alerts
Notification Center
- If turned off, notifications for Tok messages will not contain the sender and summary.
+ Turn off to remove sender and summary from Tok message notifications.
Save to:%1$s
OfflineMessageBot
- How to send offline Messages
+ How to send offline messages
1. Add this bot on both sides.
- \n2. You can send text messages when your friend\'s status is \'OfflineMessageBot online\'.
+ \n2. You can send messages when your friend\'s status is \'OfflineMessageBot online\'.
- Add this bot to send offline messages with friends
+ Add this bot to send offline messages to friends
Warning
- This is a temporary solution to send offline messages in TOK.\nYou have to know that the bot will store your encrypted messages on a server, and forward your encrypted text messages while your friend is online. The bot won\'t and can\'t decrypt your message. If this solution is acceptable, you can add this bot to send offline messages,or just delete this bot from contact list.
+ This is a temporary solution to send offline messages in TOK.\nThe bot will store your encrypted messages it can not decrypt on a server, and send them when your friend is online. Delete this bot from your contact list if you don\'t want this.
More about OfflineMessageBot
- 1. Please be noted that this feature works only when both sides in the conversation add this bot.\n2. This bot is simply forwarding your encrypted text messages.\n3. This bot works as illustrated in this figure:
- 4. This bot deletes the encrypted message immediately after it reaches the recipient. If the recipient is offline, the encrypted message is kept for up to 30 days, and the encrypted message makes absolutely nonsense to any third party.\n5. The bot we provide is the only valid choice for now.
- 6. The code of bot is published on github
- https://github.com/InsightIM
+ 1. This feature only works when both sides in a conversation add this bot.\n2. This bot is simply forwards your encrypted text messages.\n3. The exchange is detailed in this illustration:
+ 4. The encrypted message, (which can not be decrypted by a third party) is kept for up to 30 days, if the recipient is offline. The bot deletes its copy of the encrypted message once itreaches the recipient.\n5. This is the only valid offline messaging option for now.
+ 6. The code for the bot is published on GitHub
+ https://github.com/InsightIM
Copy Link
- No offline message bots are available. \nClick to add>>
+ No offline messaging bots are available. \nClick to add>>
Your friend didn\'t add an offline messaging bot
Only text offline messages are supported
OfflineMessageBot Online
- Sorry, can\'t send file to FindFriendBot!
-
- Delete this contact?\nYour chat history will be lost.
- Delete this bot?\nYou offline messages will be lost.
- Your friend has add the OfflineMessageBot\nyou can send offline messages now.
+ The FindFriendBot does not want your files.
+ Delete this contact?\nYour mutual chat history will be lost.
+ Delete this bot?\nAny undelivered offline messages will be lost.
+ Your friend has to add the OfflineMessageBot\nyou can send offline messages now.