diff options
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 55 |
1 files changed, 15 insertions, 40 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4b3cd95b6..6dbf53d3f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -107,9 +107,7 @@ <string name="pref_accept_files_mobileroaming">Accept files in mobile roaming connections</string> <string name="pref_accept_files_summary_mobileroaming">When connected with mobile data in roaming automatically accept files smaller than…</string> <string name="pref_attachments">Attachments</string> - <string name="pref_return_to_previous">Quick Sharing</string> - <string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string> - <string name="pref_notification_settings">Notification</string> + <string name="pref_notification_settings">Notification</string> <string name="pref_notifications">Notifications</string> <string name="pref_notifications_summary">Notify when a new message arrives</string> <string name="pref_vibrate">Vibrate</string> @@ -118,17 +116,13 @@ <string name="pref_led_summary">Blink notification light when a new message arrives</string> <string name="pref_sound">Ringtone</string> <string name="pref_sound_summary">Play sound when a new message arrives</string> - <string name="pref_notification_grace_period">Grace Period</string> - <string name="pref_notification_grace_period_summary">The length of time Conversations keeps quiet after seeing activity on another device</string> - <string name="pref_advanced_options">Advanced</string> - <string name="pref_send_crash">Send crash reports</string> + <string name="pref_send_crash">Send crash reports</string> <string name="pref_send_crash_summary">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger</string> <string name="pref_confirm_messages">Confirm Messages</string> <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string> <string name="pref_ui_options">UI</string> <string name="openpgp_error">OpenKeychain reported an error</string> - <string name="error_decrypting_file">I/O Error decrypting file</string> - <string name="accept">Accept</string> + <string name="accept">Accept</string> <string name="error">An error has occurred</string> <string name="pref_grant_presence_updates">Grant presence updates</string> <string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string> @@ -203,8 +197,7 @@ <string name="last_seen_hours">%d hours ago</string> <string name="last_seen_day">1 day ago</string> <string name="last_seen_days">%d days ago</string> - <string name="never_seen">never seen</string> - <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string> + <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string> <string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string> <string name="openpgp_messages_found">OpenPGP encrypted messages found</string> <string name="your_fingerprint">Your fingerprint</string> @@ -280,8 +273,7 @@ <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string> <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string> <string name="pref_expert_options">Expert settings</string> - <string name="pref_expert_options_summary">Please be careful with these</string> - <string name="title_activity_about">About Pix-Art Messenger</string> + <string name="title_activity_about">About Pix-Art Messenger</string> <string name="pref_about_conversations_summary">Build and licensing information</string> <string name="pref_about_message" translatable="false">Pix-Art Messenger \n\nCopyright © 2014-2016 Christian Schneppe @@ -338,9 +330,7 @@ <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string> <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string> <string name="pref_expert_options_other">Other</string> - <string name="pref_conference_name">Conference name</string> - <string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string> - <string name="pref_autojoin">Automatically join conferences</string> + <string name="pref_autojoin">Automatically join conferences</string> <string name="pref_autojoin_summary">Respect the autojoin flag in conference bookmarks</string> <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string> <string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string> @@ -348,8 +338,7 @@ <string name="conference_members_only">This conference is members only</string> <string name="conference_kicked">You have been kicked from this conference</string> <string name="conference_shutdown">The conference was shut down</string> - <string name="conference_unknown_error">You are no longer in this conference</string> - <string name="using_account">using account %s</string> + <string name="using_account">using account %s</string> <string name="checking_x">Checking %s on HTTP host</string> <string name="not_connected_try_again">You are not connected. Try again later</string> <string name="check_x_filesize">Check %s size</string> @@ -405,9 +394,7 @@ <string name="enable_notifications">Enable notifications</string> <string name="no_conference_server_found">No conference server found</string> <string name="conference_creation_failed">Conference creation failed!</string>s - <string name="secret_accepted">Secret accepted!</string> - <string name="reset">Reset</string> - <string name="account_image_description">Account avatar</string> + <string name="account_image_description">Account avatar</string> <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string> <string name="copy_omemo_clipboard_description">Copy OMEMO fingerprint to clipboard</string> <string name="regenerate_omemo_key">Regenerate OMEMO key</string> @@ -484,8 +471,7 @@ <string name="sending_x_file">Sending %s</string> <string name="offering_x_file">Offering %s</string> <string name="hide_offline">Hide offline</string> - <string name="disable_account">Disable Account</string> - <string name="is_typing">is typing…</string> + <string name="is_typing">is typing…</string> <string name="pref_chat_states">Typing notifications</string> <string name="pref_chat_states_summary">Let your contact know when you are writing a new message</string> <string name="send_location">Send location</string> @@ -566,10 +552,7 @@ <string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string> <string name="device_does_not_support_certificates">Your device does not support the selection of client certificates!</string> <string name="changelog">Changes</string> - <string name="pref_connection_options">Connection</string> - <string name="pref_use_tor">Connect via Tor</string> - <string name="pref_use_tor_summary">Tunnel all connections through the Tor network. Requires Orbot</string> - <string name="account_settings_hostname">Hostname</string> + <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> <string name="hostname_or_onion">Server- or .onion-Address</string> <string name="not_a_valid_port">This is not a valid port number</string> @@ -661,20 +644,13 @@ <string name="creating_conference">Creating conference…</string> <string name="import_text">There is a backup on your device which can be imported.\nPossibly you will be asked to uninstall the old version or Conversations and your Messenger will be restarted during backup process. Shall the backup be imported? </string> <string name="import_database">Import backup</string> - <string name="uninstall_app_text">There is an old version of Pix-Art Messenger or Conversations installed. If you have an old Pix-Art Messenger installed, you should uninstall this version. After uninstalled the old versoin, you should choose \'import backup\' again and we will import your data to the new version.</string> - <string name="you">You</string> - <string name="invite_again">Invite again</string> + <string name="invite_again">Invite again</string> <string name="inviteUser_Subject">has invited you via</string> <string name="InviteText">Hello,\n\nthe user %s has invited you to Pix-Art Messenger. If you are using Android, give it a try and click the following link to start over...</string> - <string name="gp_short">Short</string> - <string name="gp_medium">Medium</string> - <string name="gp_long">Long</string> - <string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string> + <string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string> <string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Pix-Art Messenger</string> - <string name="pref_privacy">Privacy</string> - <string name="invite_user">Invite to Pix-Art Messenger</string> - <string name="request_permissions_title">Pix-Art Messenger permissions</string> - <string name="request_permissions_message">Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself.</string> + <string name="invite_user">Invite to Pix-Art Messenger</string> + <string name="request_permissions_message">Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself.</string> <string name="request_permissions_message_again">You have denied some or all permissions needed for Pix-Art Messenger. Would you like to jump to the settings and allow these permissions? If you denie any of these permissions, the app will close itself.</string> <string name="unable_to_connect_to_keychain">Unable to connect to OpenKeychain</string> <string name="no_permission">Pix-Art Messenger has no permissions</string> @@ -702,8 +678,7 @@ <string name="preparing_video">Prepare video for transmission. Please wait…</string> <string name="compressing_video">Compressing video, please wait…</string> <string name="shared_video_with_x">Shared video with %s</string> - <string name="unread_messages">Unread messages:</string> - <string name="no_permission_to_access_x">No permission to access %s</string> + <string name="no_permission_to_access_x">No permission to access %s</string> <string name="remote_server_not_found">Remote server not found</string> <string name="error_file_corrupt">This file seems to be corrupt.</string> <string name="unable_to_update_account">Unable to update account</string> |