From 8ab397c71505c8ab45e17f6efb801e4bb9ee9176 Mon Sep 17 00:00:00 2001
From: Antoine Aflalo <Belphemur@users.noreply.github.com>
Date: Fri, 28 Apr 2017 09:49:44 -0400
Subject: [PATCH] Second round of English update

---
 app/src/main/res/values/strings.xml | 142 ++++++++++++++--------------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d95d47fa..7e77dd33 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,86 +49,86 @@
     <string name="content_warning">Content warning</string>
     <string name="please_add_account">You need to set an account to post a toot.</string>
     <string name="not_selected">(not selected)</string>
-    <string name="content_warning_hint">Content warning text missing.</string>
-    <string name="content_hint">please input your status</string>
-    <string name="status">status</string>
-    <string name="list_empty">no items in list</string>
-    <string name="post_from">post from</string>
-    <string name="choose_account">choose account</string>
+    <string name="content_warning_hint">Warning for your toot</string>
+    <string name="content_hint">The content of your toot</string>
+    <string name="status">Toot</string>
+    <string name="list_empty">List empty</string>
+    <string name="post_from">Post from</string>
+    <string name="choose_account">Choose your account</string>
     <string name="response_not_json">API response is not JSON.</string>
-    <string name="attachment_too_many">max 4 files allowed.</string>
-    <string name="account_select_please">please select account</string>
-    <string name="login_failed">login failed</string>
-    <string name="file_size_too_big">file size too big. maximum limit is 8MB.</string>
-    <string name="visibility_public">public</string>
-    <string name="visibility_unlisted">unlisted</string>
-    <string name="visibility_private">private</string>
-    <string name="visibility_direct">direct</string>
-    <string name="choose_visibility">choose visibility</string>
-    <string name="confirm_delete_attachment">remove this attachment?</string>
-    <string name="post_error_contents_empty">please input your status.</string>
-    <string name="post_error_contents_warning_empty">please input contents warning</string>
+    <string name="attachment_too_many">a max of 4 files is allowed.</string>
+    <string name="account_select_please">Select the account</string>
+    <string name="login_failed">Login failed</string>
+    <string name="file_size_too_big">File size too big. Maximum limit is 8MB.</string>
+    <string name="visibility_public">Public</string>
+    <string name="visibility_unlisted">Unlisted</string>
+    <string name="visibility_private">Private</string>
+    <string name="visibility_direct">Direct</string>
+    <string name="choose_visibility">Choose visibility</string>
+    <string name="confirm_delete_attachment">Remove this attachment?</string>
+    <string name="post_error_contents_empty">You can't post an empty toot.</string>
+    <string name="post_error_contents_warning_empty">Your toot needs a warning.</string>
     <string name="wait_previous_operation">Please wait until last operation is over.</string>
     <string name="cant_remove_boost_while_favourited">Can\'t remove boost while favourited</string>
-    <string name="confirm">confirm</string>
-    <string name="confirm_boost">Boost this status? it\'s shown by all followers and your profile page.</string>
-    <string name="display_name_favourited_by">favourited by %1$s</string>
-    <string name="display_name_boosted_by">boosted by %1$s</string>
-    <string name="display_name_replied_by">replied by %1$s</string>
+    <string name="confirm">Confirm</string>
+    <string name="confirm_boost">Boost this status? It\'s shown to all followers and on your profile page.</string>
+    <string name="display_name_favourited_by">%1$s favourited</string>
+    <string name="display_name_boosted_by">%1$s boosted</string>
+    <string name="display_name_replied_by">%1$s replied</string>
     <string name="display_name_followed_by">followed by %1$s</string>
-    <string name="account">account</string>
-    <string name="account_setting">account setting</string>
-    <string name="setting">setting</string>
-    <string name="app_setting">app setting</string>
-    <string name="column_list">column list</string>
-    <string name="update_access_token">update access token</string>
-    <string name="account_remove">remove account from this app</string>
-    <string name="actions">actions</string>
-    <string name="default_status_visibility">default visibility of status</string>
-    <string name="confirm_before_boost">confirm before boost</string>
-    <string name="sensitive_content_default_open">sensitive content default open</string>
-    <string name="user">user</string>
-    <string name="confirm_account_remove">Account will be deleted. also all columns are remove.\nAre you sure?</string>
-    <string name="user_name_not_match">user name not match.</string>
+    <string name="account">Account</string>
+    <string name="account_setting">Account settings</string>
+    <string name="setting">Settings</string>
+    <string name="app_setting">App settings</string>
+    <string name="column_list">Columns list</string>
+    <string name="update_access_token">Update the access token</string>
+    <string name="account_remove">Remove this account</string>
+    <string name="actions">Actions</string>
+    <string name="default_status_visibility">Default visibility of toot</string>
+    <string name="confirm_before_boost">Confirm before boost</string>
+    <string name="sensitive_content_default_open">Always open sensitive content</string>
+    <string name="user">User</string>
+    <string name="confirm_account_remove">This account will be deleted and all the columns will be removed.\nAre you sure?</string>
+    <string name="user_name_not_match">Username doesn\'t match</string>
     <string name="access_token_updated_for">%1%s\'s access token was updated.</string>
-    <string name="back_to_column_list">show column list when back button pressed</string>
-    <string name="account_empty">Account  is not set up.Please add account.</string>
-    <string name="dont_confirm_before_close_column">don\'t confirm before close column</string>
-    <string name="drag_handle">drag handle</string>
-    <string name="delete">delete</string>
-    <string name="column_list_desc">swipe to delete. sorting and deletion is applied at back or pick.</string>
-    <string name="last_selection">last selection</string>
+    <string name="back_to_column_list">Go to columns list when back button is pressed</string>
+    <string name="account_empty">Account is not set up.Please add account.</string>
+    <string name="dont_confirm_before_close_column">Close column without confirmation</string>
+    <string name="drag_handle">Drag handle</string>
+    <string name="delete">Delete</string>
+    <string name="column_list_desc">Swipe to delete. Long press to sort. Changes will be applied when reloading the view.</string>
+    <string name="last_selection">Last selection</string>
     <string name="column_index">%1$d/%2$d</string>
-    <string name="reply_to_this_status">reply to this status:</string>
-    <string name="cant_change_account_when_attachiment_specified">can\'t change account when attachement  specified.</string>
-    <string name="column">column</string>
-    <string name="conversation_view">conversation view</string>
-    <string name="conversation_around">conversation around status:%1$d</string>
-    <string name="instance_not_need_slash">please input just host name of instance, without \'/\'.</string>
-    <string name="mail_address_not_contains_at_mark">please input user mail address that contains \'@\' and \'.\'</string>
+    <string name="reply_to_this_status">Reply to this toot:</string>
+    <string name="cant_change_account_when_attachiment_specified">You can\'t change account when you have an attachment.</string>
+    <string name="column">Column</string>
+    <string name="conversation_view">Conversation view</string>
+    <string name="conversation_around">Conversation around toot:%1$d</string>
+    <string name="instance_not_need_slash">Hostname of the instance, without \'/\'.</string>
+    <string name="mail_address_not_contains_at_mark">USe emails that contains \'@\' and \'.\'</string>
     <string name="instance_hint">ex) mastodon.social</string>
     <string name="mail_hint">ex) your@e-mail.address</string>
-    <string name="unfollow">unfollow</string>
-    <string name="follow_succeeded">follow succeeded</string>
-    <string name="unfollow_succeeded">unfollow succeeded</string>
-    <string name="mute">mute</string>
-    <string name="unmute">unmute</string>
-    <string name="block">block</string>
-    <string name="unblock">unblock</string>
-    <string name="report">report</string>
-    <string name="cant_follow_locked_user">could not follow the non-public user</string>
-    <string name="unmute_succeeded">unmute succeeded</string>
-    <string name="mute_succeeded">mute succeeded</string>
-    <string name="unblock_succeeded">unblock succeeded</string>
-    <string name="block_succeeded">block succeeded</string>
-    <string name="report_reason">comment for report reason</string>
-    <string name="comment_empty">please comment for any reason to report</string>
+    <string name="unfollow">Unfollow</string>
+    <string name="follow_succeeded">Follow succeeded</string>
+    <string name="unfollow_succeeded">Unfollow succeeded</string>
+    <string name="mute">Mute</string>
+    <string name="unmute">Unmute</string>
+    <string name="block">Block</string>
+    <string name="unblock">Unblock</string>
+    <string name="report">Report</string>
+    <string name="cant_follow_locked_user">Could not follow the non-public user</string>
+    <string name="unmute_succeeded">Unmute succeeded</string>
+    <string name="mute_succeeded">Mute succeeded</string>
+    <string name="unblock_succeeded">Unblock succeeded</string>
+    <string name="block_succeeded">Block succeeded</string>
+    <string name="report_reason">Reason of the report</string>
+    <string name="comment_empty">You need to state the reason of the report</string>
     <string name="report_completed">report completed.</string>
-    <string name="mention">mention</string>
-    <string name="hashtag_of">hashtag :#%1$s</string>
-    <string name="open_in_account">open with %1$s</string>
-    <string name="open_web_page">open web page</string>
-    <string name="open_web_on_host">open web page on %1$s</string>
+    <string name="mention">Mention</string>
+    <string name="hashtag_of">Hashtag :#%1$s</string>
+    <string name="open_in_account">Open with %1$s</string>
+    <string name="open_web_page">Open web page</string>
+    <string name="open_web_on_host">Ppen web page on %1$s</string>
     <string name="follow_from_another_account">follow_from_another_account</string>
     <string name="search_of">search \"%1$s\"</string>
     <string name="search">search</string>