Source strings reworked

1 files changed, 44 insertions, 44 deletions

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2390d55..19bd59f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,15 +59,15 @@
     <string name="channel_menu_pin">Pin</string>
 
     <!-- Comment Fragment -->
-    <string name="comment_view">DISPLAY</string>
-    <string name="comment_edit_source">EDIT SOURCE</string>
-    <string name="comment_view_source">VIEW SOURCE</string>
+    <string name="comment_view">View</string>
+    <string name="comment_edit_source">Edit source</string>
+    <string name="comment_view_source">View source</string>
     
     <!-- Server Info Fragment -->
     <string name="control_channel">Control channel</string>
-    <string name="tcp_encryption_mode">Encrypted with 256 bit AES256-SHA</string>
+    <string name="tcp_encryption_mode">Encrypted with 256 bit AES-256-SHA</string>
     <string name="voice_channel">Voice channel</string>
-    <string name="udp_encryption_mode">Encrypted with 128 bit OCB-AES128</string>
+    <string name="udp_encryption_mode">Encrypted with 128 bit OCB-AES-128</string>
     <string name="audio_bandwidth">Audio bandwidth</string>
     <string name="server_info_protocol">Protocol %s.</string>
     <string name="server_info_version">%1$s (%2$s)</string>
@@ -82,13 +82,13 @@
     <string name="server_match_progress">Finding a server…</string>
     <string name="server_match_found">Server found</string>
     <string name="server_match_not_found">Couldn\'t find server</string>
-    <string name="server_match_expand_country">Couldn\'t find any optimal servers in your country. Expand search worldwide?</string>
+    <string name="server_match_expand_country">Couldn\'t find any optimal servers in your country. Search worldwide?</string>
     <string name="server_match_info">Name: %1$s\nHost: %2$s:%3$d\nUsers: %4$d / %5$d\nVersion: %6$s \nCountry: %7$s \nLatency: %8$d ms</string>
-    <string name="server_match_description">Mumla can automatically find you an empty server, optimizing based on the server\'s location, version, and latency.</string>
+    <string name="server_match_description">Mumla can automatically find you an empty server, optimizing for location, version, and latency.</string>
 
     <!-- Common -->
     <string name="channels">Channels</string>
-    <string name="no_servers">No servers added.\nPress the \'add\' button on the action bar to begin.</string>
+    <string name="no_servers">Press \'Add\' from the action bar to add a server first.</string>
     <string name="server_add">Add Server</string>
     <string name="server_password">Password</string>
     <string name="server_username">Username</string>
@@ -96,22 +96,22 @@
     <string name="server_host">Address</string>
     <string name="server_label">Label</string>
     <string name="connecting">Connecting</string>
-    <string name="connecting_to_server">Connecting to %s</string>
+    <string name="connecting_to_server">Connecting to %s…</string>
     <string name="fragment_chat">Chat</string>
     <string name="fragment_channel">Channel</string>
     <string name="menu_settings">Settings</string>
-    <string name="ptt">PUSH TO TALK</string>
+    <string name="ptt">Push-to-talk</string>
     <string name="mute">Mute</string>
     <string name="deafen">Deafen</string>
     <string name="disconnect">Disconnect</string>
-    <string name="disconnectSure">Are you sure you want to disconnect from Mumble?</string>
+    <string name="disconnectSure">Are you sure you want to disconnect from %s?</string>
     <string name="save">Save</string>
     <string name="add">Add</string>
     <string name="preferences">Preferences</string>
     <string name="togglelocalmute">Toggle Local Mute</string>
     <string name="chat">Chat</string>
     <string name="perm_denied">Permission denied!</string>
-    <string name="connectionRefused">Connection Refused</string>
+    <string name="connectionRefused">Connection refused</string>
     <string name="confirm_delete_server">Are you sure you want to delete this server?</string>
     <string name="confirm_delete_channel">Are you sure you want to delete this channel?</string>
     <string name="disconnected">Disconnected</string>
@@ -132,11 +132,11 @@
     <string name="messageReceived">New message</string>
     <string name="generateCert">Generate Certificate</string>
     <string name="generateCertSuccess">Your certificate has been set and saved as %s!</string>
-    <string name="generateCertFailure">Failed to generate certificate.</string>
+    <string name="generateCertFailure">Could not generate certificate.</string>
     <string name="generateCertProgress">Generating certificate…</string>
     <string name="search">Search</string>
     <string name="searchHint">Search channels and users</string>
-    <string name="undocumentedWakeLock">Unfortunately, it doesn\'t look like we can provide proximity sensor wake lock support for your device. Please change the call mode to speakerphone.</string>
+    <string name="undocumentedWakeLock">Proximity sensor wake lock is not supported on your device. Please change the call mode to speakerphone.</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="recordingVolume">Recording Volume Boost</string>
     <string name="quickConnect">Quick Connect</string>
@@ -146,16 +146,16 @@
     <string name="remove">Remove</string>
     <string name="delete">Delete</string>
     <string name="retry">Retry</string>
-    <string name="messageToUser">Type message to user \'%s\'</string>
-    <string name="messageToChannel">Type message to channel \'%s\' here</string>
+    <string name="messageToUser">Type a message to user \'%s\'</string>
+    <string name="messageToChannel">Type message to channel \'%s\'</string>
     <string name="online">Online</string>
     <string name="offline">Offline</string>
     <string name="clearChat">Clear Chat</string>
     <string name="connected">Connected</string>
-    <string name="mumlaConnected">Mumla Connected</string>
-    <string name="mumlaConnecting">Mumla Connecting</string>
-    <string name="mumlaDisconnected">Mumla Disconnected</string>
-    <string name="lostConnection">Lost connection to the server.</string>
+    <string name="mumlaConnected">Mumla connected</string>
+    <string name="mumlaConnecting">Mumla connecting…</string>
+    <string name="mumlaDisconnected">Mumla disconnected</string>
+    <string name="lostConnection">Lost connection to server %s.</string>
     <string name="resume">Resume</string>
     <string name="channel">Channel</string>
     <string name="user">User</string>
@@ -195,24 +195,24 @@
     <string name="fullscreen">Fullscreen</string>
     <string name="fullscreen_chat">Chat</string>
     <string name="fullscreen_channel">Channel</string>
-    <string name="fetchingServers">Please wait, fetching list of public servers.</string>
+    <string name="fetchingServers">Please wait, fetching list of public servers…</string>
     <string name="information">Information</string>
     <string name="register">Register Self</string>
     <string name="userControl">User Control</string>
     <string name="registerSelfSuccess">Sent registration request</string>
-    <string name="error_fetching_servers">Error fetching servers!\nCheck your internet connection.</string>
-    <string name="coming_soon">This feature is coming soon.</string>
+    <string name="error_fetching_servers">Could not fetch servers.\nAre you connected to the Internet?</string>
+    <string name="coming_soon">Feature coming soon.</string>
     <string name="search_channel_users">%d users</string>
     <string name="reconnecting">Reconnecting in %d seconds.</string>
     <string name="tapToReconnect">Tap to reconnect</string>
     <string name="overlay">Overlay</string>
     <string name="hint_reason">Reason</string>
-    <string name="hint_ptt">Push to Talk</string>
-    <string name="hint_ptt_summary">Simply press this button down to talk. Double-tap to toggle it.</string>
+    <string name="hint_ptt">Push-to-talk</string>
+    <string name="hint_ptt_summary">Simply press this button to talk. Double-tap to toggle it.</string>
     <string name="hint_server_add">Welcome to Mumla</string>
-    <string name="hint_server_add_summary">To begin, add a favourite server by pressing the add button on the action bar.</string>
+    <string name="hint_server_add_summary">Add a favourite server by pressing \'Add\' from the action bar.</string>
     <string name="hint_switching">Switching Between Views</string>
-    <string name="hint_switching_summary">Switch between the chat and channel views by using the buttons in the top left, or swiping.</string>
+    <string name="hint_switching_summary">Switch between the chat and channel views by using the top left buttons, or swiping.</string>
     <string name="action_settings">Settings</string>
     <string name="reconnect">Reconnect</string>
     <string name="reconnect_dialog_message">You are already connected to a server. Connect to this server instead?</string>
@@ -223,19 +223,19 @@
     <string name="position">Position</string>
     <string name="channel_edit">Edit Channel</string>
     <string name="channel_add">Add Channel</string>
-    <string name="tts_failed">TTS failed to initialize</string>
-    <string name="mumble_url_parse_failed">Failed to parse Mumble URL!</string>
+    <string name="tts_failed">Could not start TTS</string>
+    <string name="mumble_url_parse_failed">Mumble URL is not valid.</string>
     <string name="first_run_generate_certificate_title">Welcome to Mumla!</string>
     <string name="first_run_generate_certificate">Generating a certificate is highly recommended, and necessary for connection to some servers.</string>
     <string name="generate">Generate</string>
-    <string name="certificate_not_valid">Could not load certificate \'%s\'!</string>
-    <string name="invalid_password">Invalid password.</string>
+    <string name="certificate_not_valid">Could not load certificate %s!</string>
+    <string name="invalid_password">Wrong password.</string>
     <string name="send_message">Send message</string>
     <string name="channel_menu_view_description">View Description</string>
     <string name="untrusted_certificate">Untrusted Certificate</string>
     <string name="allow">Allow</string>
     <string name="trust_added">Added certificate to trust store</string>
-    <string name="trust_add_failed">Failed to add certificate to trust store!</string>
+    <string name="trust_add_failed">Could not add certificate to trust store!</string>
     <string name="trust_cleared">Trust database cleared</string>
     <string name="cancelled">Cancelled</string>
     <string name="transmit_mode">Transmit Mode</string>
@@ -246,32 +246,32 @@
     <string name="invalid_port_range">Invalid port (1-65535)</string>
     <string name="invalid_username">Invalid username</string>
     <string name="cancel_reconnect">Cancel reconnect</string>
-    <string name="attempting_reconnect">Error: %s.\n\nAttempting to reconnect.</string>
-    <string name="change_requires_reconnect">A reconnect is required for this change to take effect.</string>
+    <string name="attempting_reconnect">%s. Reconnecting…</string>
+    <string name="change_requires_reconnect">Reconnect for change to take effect.</string>
     <string name="no_certificate">No Certificate</string>
     <string name="certificates">Certificates</string>
     <string name="decrypt_certificate">Decrypt Certificate</string>
     <string name="password">Password</string>
     <string name="invalid_certificate">Invalid certificate, could not load.</string>
-    <string name="certificate_load_failed">Failed to store certificate!</string>
-    <string name="certificate_import_success">Successfully imported certificate \'%s\'.</string>
+    <string name="certificate_load_failed">Could not store certificate!</string>
+    <string name="certificate_import_success">Imported certificate %s.</string>
     <string name="migration_certificate_begin">Beginning certificate migration…</string>
-    <string name="migration_certificate_success">Successfully migrated certificate!</string>
-    <string name="error_writing_to_storage">Error writing to external storage.</string>
-    <string name="export_success">Exported certificate to \'%s\'.</string>
+    <string name="migration_certificate_success">Certificate migrated.</string>
+    <string name="error_writing_to_storage">Could not write to external storage.</string>
+    <string name="export_success">Certificate exported to %s.</string>
     <string name="notification_unread_many">%d new messages</string>
     <string name="context_channel_link">Link</string>
     <string name="context_channel_unlink_all">Unlink All</string>
     <string name="context_channel_shout">Set Voice Target</string>
     <string name="shout_include_linked">Shout to linked channels</string>
     <string name="shout_include_subchannels">Shout to subchannels</string>
-    <string name="shout_failed">Failed to create voice target!</string>
+    <string name="shout_failed">Could not create voice target!</string>
     <string name="shout_target">Shouting to %s</string>
     <string name="shout_configure">Configure Voice Target</string>
-    <string name="grant_perm_microphone">Please grant permission to the microphone.</string>
-    <string name="grant_perm_storage">Please grant permission to external storage.</string>
+    <string name="grant_perm_microphone">Please grant microphone permission.</string>
+    <string name="grant_perm_storage">Please grant external storage permission.</string>
     <string name="grant_perm_draw_over_apps">Please grant permission to display over other apps.</string>
-    <string name="orbot_not_installed">Orbot app is not installed. Disabling Tor!</string>
-    <string name="orbot_tor_failed">Failed to connect to local Tor proxy on port %d (SOCKS).\n\nPlease ensure that Orbot app is running properly.</string>
+    <string name="orbot_not_installed">The Orbot app is not installed. Not using Tor.</string>
+    <string name="orbot_tor_failed">Could not connect to local Tor proxy on port %d (SOCKS).\n\nPlease ensure that the Orbot app is running.</string>
     <string name="default_">Default</string>
 </resources>