diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1dbb6f83..d6cc941b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,16 +5,16 @@
     <string name="staggered_layout_manager" translatable="false">com.fastaccess.ui.widgets.recyclerview.layout_manager.StaggeredManager</string>
     <string name="scroll_behavior" translatable="false">@string/appbar_scrolling_view_behavior</string>
     <string name="custom_tablet_provider" translatable="false">com.fastaccess.ui.widgets.TabletBehavior</string>
-    <string name="in_progress">In Progress, Please Wait…</string>
+    <string name="in_progress">Loading, please wait…</string>
     <string name="action">Action</string>
     <string name="settings">Settings</string>
-    <string name="cancel">@android:string/cancel</string>
-    <string name="ok">@android:string/ok</string>
-    <string name="no_data">No Data Available.</string>
+    <string name="cancel">Cancel</string>
+    <string name="ok">OK</string>
+    <string name="no_data">No data available</string>
     <string name="search">Search</string>
-    <string name="please_login">Please Login to Continue Using FastHub</string>
-    <string name="sign_in_to_github">Sign-In to your Github account to get the best out of FastHub</string>
-    <string name="failed_login">Failed to sign-in.</string>
+    <string name="please_login">Please login to continue using FastHub</string>
+    <string name="sign_in_to_github">Sign-In to your GitHub account to get the best out of FastHub</string>
+    <string name="failed_login">Failed to sign-in</string>
     <string name="sign_in">Sign-In</string>
     <string name="share">Share</string>
     <string name="reload">Reload</string>
@@ -22,7 +22,7 @@
     <string name="gists">Gists</string>
     <string name="profile">Profile</string>
     <string name="error">Error</string>
-    <string name="press_again_to_exit">Press once again to exit!</string>
+    <string name="press_again_to_exit">Press once again to exit</string>
     <string name="readme">Readme</string>
     <string name="opened">Opened</string>
     <string name="closed">Closed</string>
@@ -37,56 +37,56 @@
     <string name="follow">Follow</string>
     <string name="unfollow">Unfollow</string>
     <string name="user">User</string>
-    <string name="icon_transition">profile_image_transition</string>
-    <string name="title_transition">profile_title_transition</string>
+    <string name="icon_transition" translatable="false">profile_image_transition</string>
+    <string name="title_transition" translatable="false">profile_title_transition</string>
     <string name="code">Code</string>
     <string name="issues">Issues</string>
     <string name="pull_requests">Pull Requests</string>
     <string name="details">Details</string>
-    <string name="repo">Repo</string>
-    <string name="archive_file_detected_error">Archive file detected, Please download the file to view its content.</string>
-    <string name="minimum_three_chars">Minimum Characters (3)</string>
-    <string name="no_file_found">No File Found</string>
-    <string name="no_readme_found">No ReadMe Found</string>
+    <string name="repo">Repository</string>
+    <string name="archive_file_detected_error">Archive file detected, please download the file to view its content.</string>
+    <string name="minimum_three_chars">Minimum characters (3)</string>
+    <string name="no_file_found">No file found</string>
+    <string name="no_readme_found">No Readme found</string>
     <string name="downloading">Downloading…</string>
     <string name="downloading_file">Downloading File…</string>
     <string name="released">Released</string>
     <string name="drafted">Drafted</string>
-    <string name="this_text">This</string>
-    <string name="on">On</string>
+    <string name="this_text">This</string><!-- TODO use string format args instead of concatenating string resources -->
+    <string name="on">On</string><!-- TODO use string format args instead of concatenating string resources -->
     <string name="releases">Releases</string>
-    <string name="no_body">No Body</string>
+    <string name="no_body">No body</string>
     <string name="download_as_zip">Source code (zip)</string>
     <string name="download_as_tar">Source code (tar.gz)</string>
     <string name="contributors">Contributors</string>
     <string name="merged">Merged</string>
-    <string name="by">By</string>
+    <string name="by">By</string><!-- TODO use string format args instead of concatenating string resources -->
     <string name="star">Star</string>
     <string name="fork">Fork</string>
     <string name="close_issue">Close Issue</string>
     <string name="re_open_issue">Re-Open Issue</string>
     <string name="re_open">Re-Open</string>
     <string name="close">Close</string>
-    <string name="success_re_opened">Successfully re-opened.</string>
+    <string name="success_re_opened">Successfully re-opened</string>
     <string name="lock_issue_details">Locking the conversation means:\n&#183;Other users can’t add new comments to this issue.\n&#183;You and other
         collaborators with access to this repository can still leave comments that others can see.\n&#183;You can always unlock this issue again in the
         future.\n</string>
     <string name="unlock_issue_details">Unlocking the conversation means:\n&#183;Everyone will be able to comment on this issue once more.\n&#183;You can
         always lock this issue again in the future.\n</string>
-    <string name="lock_issue">Lock Conversation</string>
-    <string name="unlock_issue">Unlock Conversation</string>
-    <string name="error_closing_issue">Error in closing issue, Please try again later.</string>
-    <string name="error_re_opening_issue">Error re-opening issue, Please try again later.</string>
-    <string name="success_closed">Successfully closed issue.</string>
-    <string name="no_description_provided"><p>No description provided.</p></string>
+    <string name="lock_issue">Lock conversation</string>
+    <string name="unlock_issue">Unlock conversation</string>
+    <string name="error_closing_issue">Error closing Issue, please try again later.</string>
+    <string name="error_re_opening_issue">Error re-opening Issue, please try again later.</string>
+    <string name="success_closed">Successfully closed Issue</string>
+    <string name="no_description_provided"><p>No description provided</p></string>
     <string name="header_one">Header One</string>
     <string name="header_two">Header Two</string>
     <string name="header_three">Header Three</string>
     <string name="bold">Bold</string>
     <string name="italic">Italic</string>
-    <string name="strike_through">Strike Through</string>
-    <string name="bullet">Bullet List</string>
-    <string name="numbered_list">Numbered List</string>
+    <string name="strike_through">Strike through</string>
+    <string name="bullet">Bullet list</string>
+    <string name="numbered_list">Numbered list</string>
     <string name="header">Header</string>
     <string name="quote">Quote</string>
     <string name="link">Link</string>
@@ -97,8 +97,8 @@
     <string name="status">Status</string>
     <string name="confirm_message">Are you sure?</string>
     <string name="success">Success</string>
-    <string name="to">to</string>
-    <string name="error_deleting_comment">Error Deleting Comment</string>
+    <string name="to">to</string><!-- TODO use string format args instead of concatenating string resources -->
+    <string name="error_deleting_comment">Error deleting comment</string>
     <string name="delete">Delete</string>
     <string name="comments">Comments</string>
     <string name="comment">Comment</string>
@@ -106,33 +106,33 @@
     <string name="merge">Merge</string>
     <string name="pull_request">Pull Request</string>
     <string name="commit">Commit</string>
-    <string name="success_merge">Successfully merged.</string>
+    <string name="success_merge">Successfully merged</string>
     <string name="file">File</string>
-    <string name="file_menu">File Menu</string>
+    <string name="file_menu">File menu</string>
     <string name="files">Files</string>
     <string name="download">Download</string>
     <string name="back">Back</string>
-    <string name="parent_folder">Parent Folder</string>
-    <string name="code_viewer">Code Viewer</string>
-    <string name="open_in_browser">Open in Browser</string>
-    <string name="big_file">File is Large</string>
-    <string name="big_file_description">The file is large to open it.\nClick (OK) to Download it instead…</string>
+    <string name="parent_folder">Parent folder</string>
+    <string name="code_viewer">Code viewer</string>
+    <string name="open_in_browser">Open in browser</string>
+    <string name="big_file">Large file</string>
+    <string name="big_file_description">The file is too big to open it.\nClick "OK" to Download it instead.</string>
     <string name="viewer">Viewer</string>
     <string name="markdown">Markdown</string>
     <string name="submit">Submit</string>
-    <string name="type_here">Type Here</string>
+    <string name="type_here">Type here</string>
     <string name="write">Write</string>
     <string name="description">Description</string>
-    <string name="file_name">File Name</string>
-    <string name="file_name_hint">File Name with extension</string>
+    <string name="file_name">File name</string>
+    <string name="file_name_hint">File name with extension</string>
     <string name="create_secret_gist">Secret Gist</string>
     <string name="create_public_gist">Public Gist</string>
-    <string name="submit_as">Submit As</string>
+    <string name="submit_as">Submit as</string>
     <string name="delete_gist">Delete</string>
-    <string name="error_deleting_gist">Error deleting gist.</string>
-    <string name="no_files">No Files</string>
-    <string name="required_field">Required Field</string>
-    <string name="successfully_submitted">Successfully Submitted</string>
+    <string name="error_deleting_gist">Error deleting gist</string>
+    <string name="no_files">No files</string>
+    <string name="required_field">Required field</string>
+    <string name="successfully_submitted">Successfully submitted</string>
     <string name="create_gist">Create Gist</string>
     <string name="gist">Gist</string>
     <string name="clear">Clear</string>
@@ -141,60 +141,60 @@
     <string name="milestone">Milestone</string>
     <string name="assign_myself">Assign myself</string>
     <string name="submit_issue">Submit Issue</string>
-    <string name="error_creating_issue">Error creating issue.</string>
+    <string name="error_creating_issue">Error creating Issue</string>
     <string name="create_issue">Create Issue</string>
     <string name="error_highlighting_editor">Please un-select highlighting to continue editing.</string>
     <string name="notifictions">Notifications</string>
     <string name="unread_notification">You have unread notifications</string>
     <string name="open">Open</string>
-    <string name="notification_type">Notification Type</string>
-    <string name="back_slash">/</string>
+    <string name="notification_type">Notification type</string>
+    <string name="back_slash" translatable="false">/</string>
     <string name="labels">Labels</string>
-    <string name="no_labels">No Labels</string>
-    <string name="labels_added_successfully">Labels Added Successfully</string>
-    <string name="submit_feedback">Submit Feedback</string>
+    <string name="no_labels">No labels</string>
+    <string name="labels_added_successfully">Labels added successfully</string>
+    <string name="submit_feedback">Submit feedback</string>
     <string name="logout">Logout</string>
-    <string name="thank_you_for_feedback">Thanks for your feedback.</string>
-    <string name="current_version">Current Version</string>
+    <string name="thank_you_for_feedback">Thanks for your feedback!</string>
+    <string name="current_version">Current version</string>
     <string name="version">Version</string>
-    <string name="support_development_enable_ads">Support development, enable Ads.</string>
+    <string name="support_development_enable_ads">Support development, enable Ads</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
-    <string name="twoFactor">2fa code</string>
+    <string name="twoFactor">Two-factor authentication code</string>
     <string name="login">Login</string>
-    <string name="gist_description">Gist Description</string>
-    <string name="avatar_click_hint">Whenever there is a User avatar, you can click it to open the User\'s Profile</string>
-    <string name="feeds_fork_hint">Long click on Fork event to choose to open either Original Repo or the Forked Repo.</string>
-    <string name="click_here_to_download_release_hint">Click here to download releases.</string>
+    <string name="gist_description">Gist description</string>
+    <string name="avatar_click_hint">Wherever there is a user avatar, you can click it to open the user\'s profile</string>
+    <string name="feeds_fork_hint">Long click on a Fork event to open either the original or the forked Repo.</string>
+    <string name="click_here_to_download_release_hint">Download releases</string>
     <string name="options">Options</string>
-    <string name="click_file_option_hint">Click here to download File or share a Directory.</string>
-    <string name="comment_hint">Single tap to tag a user or to edit the comment if you are the author.\nLong press if you are the author of the
-        comment to delete it.</string>
-    <string name="star_hint">Click here to star/unstar repo.</string>
+    <string name="click_file_option_hint">Download file or share directory</string>
+    <string name="comment_hint">Tap a comment to tag its author or to edit your comment.
+        \nLong press your comment to delete it.</string>
+    <string name="star_hint">Star/unstar repo</string>
     <string name="watch">Watch</string>
-    <string name="watch_hint">Click here to watch/unwatch repo.</string>
-    <string name="fork_repo_hint">Click here to fork repo.</string>
-    <string name="no_url">No url found.</string>
-    <string name="last_updated">Last Updated</string>
+    <string name="watch_hint">Watch/unwatch repo</string>
+    <string name="fork_repo_hint">Fork repo</string>
+    <string name="no_url">No URL found</string>
+    <string name="last_updated">Last updated</string>
     <string name="preview">Preview</string>
-    <string name="view_code">Syntax Highlighter</string>
-    <string name="click_to_toggle_highlighting">Click here to toggle Syntax Highlighting.\nYou can scroll the Markdown editor icons for more
-        markdown options.</string>
-    <string name="creation_date">Creation Date</string>
-    <string name="creation_date_hint">This date represent the creation date.</string>
-    <string name="last_updated_hint">This date represent when the last activity happened.</string>
-    <string name="bbn_fab_default_behavior">com.fastaccess.ui.widgets.FloatingActionButtonBehavior</string>
+    <string name="view_code">Syntax highlighter</string>
+    <string name="click_to_toggle_highlighting">Toggle Syntax highlighting.
+        \nScroll the Markdown editor icons for more options.</string>
+    <string name="creation_date">Creation date</string>
+    <string name="creation_date_hint">When the file was created</string>
+    <string name="last_updated_hint">When the file file was last updated</string>
+    <string name="bbn_fab_default_behavior" translatable="false">com.fastaccess.ui.widgets.FloatingActionButtonBehavior</string>
     <string name="mark_all_as_read">Mark all as read</string>
-    <string name="all_notifications">All Notifications</string>
+    <string name="all_notifications">All notifications</string>
     <string name="unread">Unread</string>
     <string name="all">All</string>
     <string name="delete_repo">Delete Repo</string>
-    <string name="delete_repo_warning">Deleting this repo can not be undone.</string>
-    <string name="thirty_minutes">Thirty Minutes</string>
-    <string name="twenty_minutes">Twenty Minutes</string>
-    <string name="ten_minutes">Ten Minutes</string>
-    <string name="five_minutes">Five Minutes</string>
-    <string name="one_minute">One Minute</string>
+    <string name="delete_repo_warning">Deleting this repo can't be undone</string>
+    <string name="thirty_minutes">30 minutes</string>
+    <string name="twenty_minutes">20 minutes</string>
+    <string name="ten_minutes">10 minutes</string>
+    <string name="five_minutes">5 minutes</string>
+    <string name="one_minute">1 minute</string>
     <string name="created_repo">Created</string>
     <string name="commited">Committed</string>
     <string name="downloaded">Downloaded</string>
@@ -204,8 +204,8 @@
     <string name="commented_on_issue">Comment on Issue</string>
     <string name="created_issue">Issue</string>
     <string name="member">Member</string>
-    <string name="public_event">Open sourced</string>
-    <string name="pr_comment_review">PR comment</string>
+    <string name="public_event">Open-sourced</string>
+    <string name="pr_comment_review">Pull Request comment</string>
     <string name="pushed">Pushed</string>
     <string name="team_event">Team</string>
     <string name="deleted">Deleted</string>
@@ -214,9 +214,9 @@
     <string name="organization_event">Organization</string>
     <string name="card_event">Card</string>
     <string name="project_event">Project</string>
-    <string name="pr_review_event">PR</string>
-    <string name="repo_event">Repo</string>
-    <string name="switch_branch">Switch Branch</string>
+    <string name="pr_review_event">Pull Request</string>
+    <string name="repo_event">Repository</string>
+    <string name="switch_branch">Switch branch</string>
     <string name="assignees">Assignees</string>
     <string name="edit">Edit</string>
     <string name="update_issue">Update Issue</string>
@@ -227,34 +227,33 @@
     <string name="home">Home</string>
     <string name="create_milestone">Create Milestone</string>
     <string name="error_creating_milestone">Error creating milestone</string>
-    <string name="due_on">Due On</string>
-    <string name="no_assignees">No Assignees</string>
-    <string name="this_value">This</string>
-    <string name="commits_reflected">Commits has been switched to the selected branch.</string>
-    <string name="general_settings">General Settings</string>
-    <string name="background_job_summary">Change the background notification task time</string>
-    <string name="background_job_title">Background Notification Sync</string>
+    <string name="due_on">Due on</string><!-- TODO use string format args instead of concatenating string resources -->
+    <string name="no_assignees">No assignees</string>
+    <string name="this_value">This</string><!-- TODO use string format args instead of concatenating string resources -->
+    <string name="commits_reflected">Commits have been switched to the selected branch</string>
+    <string name="general_settings">General</string>
+    <string name="background_job_summary">Change how frequent FastHub checks for new notifications</string>
+    <string name="background_job_title">Notification sync interval</string>
     <string name="every">Every</string>
     <string name="behavior">Behavior</string>
-    <string name="recycler_view_animation_summary">Disable RecyclerView animation.</string>
-    <string name="recycler_view_animation_title">RecylerView Animation</string>
-    <string name="back_button_summary">Disable pressing the back button twice to exit FastHub.</string>
-    <string name="back_button_title">Back Button Behavior</string>
-    <string name="unsaved_data_warning">Any unsaved data will be discarded.</string>
+    <string name="recycler_view_animation_summary">Disable list animations</string>
+    <string name="recycler_view_animation_title">List animation</string>
+    <string name="back_button_summary">Disable dialog preventing you to exit FastHub accidentally</string>
+    <string name="back_button_title">Press back to exit</string>
+    <string name="unsaved_data_warning">Any unsaved changes will be discarded</string>
     <string name="private_repo">Private</string>
-    <string name="rect_avatar_summary">Use rounded rectangle instead of circular avatar.</string>
-    <string name="rect_avatar_title">Rectangle Avatar</string>
+    <string name="rect_avatar_summary">Use rounded rectangle avatars instead of circular avatars</string>
+    <string name="rect_avatar_title">Avatar appearance</string>
     <string name="rate_app">Rate this app</string>
     <string name="author">Author</string>
     <string name="fork_github">Fork on GitHub</string>
     <string name="send_email">Send an email</string>
-    <string name="email_address">fastaccess.app@gmail.com</string>
+    <string name="email_address" translatable="false">fastaccess.app@gmail.com</string>
     <string name="question_concerning_fasthub">Question concerning FastHub</string>
     <string name="feedback">Feedback</string>
     <string name="report_issue">Report an issue</string>
     <string name="report_issue_here">Having an issue? Report it here</string>
     <string name="about">About</string>
-    <string name="notification_settings">Notification Settings</string>
-    <string name="unauthorized_user">Unauthorized user.</string>
-    <string name="two_fectors_otp_error">Two-Factor authentication OTP is required to login.</string>
-</resources>
\ No newline at end of file
+    <string name="notification_settings">Notification</string>
+    <string name="unauthorized_user">Unauthorized user</string>
+</resources>