Skip to content
Snippets Groups Projects
Commit 3c2635f2 authored by ovari's avatar ovari
Browse files

misc: unify terminology

Are you sure you want to → Do you really want to
Delete your account → Delete account
in background → in the background
need → require
Please check your password. → Please check account password.
Please grant it → Enable it in device settings in order to use this feature
Started a call → Call started
take a photo → take photo
write a message → write message

Change-Id: I54fe27f1f67e6abfed5cb7a6db5ec6cb901aa4e6
GitLab: #1702
parent caf2ca93
No related branches found
No related tags found
No related merge requests found
• Allow to set conversation color • Allow to set conversation color
• Added contact details view • Added contact details view
• Allow to keep Ring running in background • Allow to keep Ring running in the background
• Call: fix controlling ringtone volume • Call: fix controlling ringtone volume
• SIP: fix profile display • SIP: fix profile display
• SIP: fix sending DTMF • SIP: fix sending DTMF
......
...@@ -31,11 +31,11 @@ along with this program; if not, write to the Free Software ...@@ -31,11 +31,11 @@ along with this program; if not, write to the Free Software
<string name="submit_issue_action_description"><u>Create new issue</u></string> <string name="submit_issue_action_description"><u>Create new issue</u></string>
<string name="submit_issue_link" translatable="false">https://git.jami.net/savoirfairelinux/jami-client-android/issues</string> <string name="submit_issue_link" translatable="false">https://git.jami.net/savoirfairelinux/jami-client-android/issues</string>
<string name="section_license">License</string> <string name="section_license">License</string>
<string name="sponsor_section">Jami is a free software developed and supported by</string> <string name="sponsor_section">Jami is free software developed and supported by</string>
<string name="copyright_section">Copyright</string> <string name="copyright_section">Copyright</string>
<string name="contribute_section">Contribute</string> <string name="contribute_section">Contribute</string>
<string name="version_section">Version</string> <string name="version_section">Version</string>
<string name="no_browser_app_installed">No web browser app found, install one to view this page</string> <string name="no_browser_app_installed">No web browser app found, install one to view this page.</string>
<string name="website_chooser_title">View website using…</string> <string name="website_chooser_title">View website using…</string>
<string name="license">This software is provided \"as is\", without warranty of any kind. For details, see <u>GNU General Public License version 3 or later</u></string> <string name="license">This software is provided \"as is\", without warranty of any kind. For details, see <u>GNU General Public License version 3 or later</u></string>
<string name="description">Jami is free software for universal communication which respects the freedoms and privacy of its users.</string> <string name="description">Jami is free software for universal communication which respects the freedoms and privacy of its users.</string>
...@@ -145,7 +145,6 @@ along with this program; if not, write to the Free Software ...@@ -145,7 +145,6 @@ along with this program; if not, write to the Free Software
<!-- RingActivity --> <!-- RingActivity -->
<string name="error_no_network">No network connectivity</string> <string name="error_no_network">No network connectivity</string>
<string name="error_account_offline">The account is offline</string> <string name="error_account_offline">The account is offline</string>
<string name="error_mobile_network_available_but_disabled">Please grant access to cellular network in the settings screen.</string>
<!-- AB menus --> <!-- AB menus -->
<string name="ab_action_chat">Text messaging</string> <string name="ab_action_chat">Text messaging</string>
...@@ -164,7 +163,7 @@ along with this program; if not, write to the Free Software ...@@ -164,7 +163,7 @@ along with this program; if not, write to the Free Software
<string name="video_setting_title">Video Settings</string> <string name="video_setting_title">Video Settings</string>
<!-- Dialing Fragment --> <!-- Dialing Fragment -->
<string name="dial_number">Dial a number</string> <string name="dial_number">Dial number</string>
<!-- History Fragment --> <!-- History Fragment -->
...@@ -193,7 +192,7 @@ along with this program; if not, write to the Free Software ...@@ -193,7 +192,7 @@ along with this program; if not, write to the Free Software
<string name="notif_outgoing_call">Outgoing call</string> <string name="notif_outgoing_call">Outgoing call</string>
<string name="notif_current_call_title">Ongoing call with %1$s</string> <string name="notif_current_call_title">Ongoing call with %1$s</string>
<string name="notif_current_call">Ongoing call</string> <string name="notif_current_call">Ongoing call</string>
<string name="notif_channel_call_in_progress">Call in Progress</string> <string name="notif_channel_call_in_progress">Call in progress</string>
<string name="notif_channel_calls">Calls</string> <string name="notif_channel_calls">Calls</string>
<string name="notif_channel_missed_calls">Missed calls</string> <string name="notif_channel_missed_calls">Missed calls</string>
<string name="notif_channel_incoming_calls">Incoming calls</string> <string name="notif_channel_incoming_calls">Incoming calls</string>
...@@ -205,7 +204,7 @@ along with this program; if not, write to the Free Software ...@@ -205,7 +204,7 @@ along with this program; if not, write to the Free Software
<string name="notif_channel_background_service_descr">Allows receiving calls and messages anytime.</string> <string name="notif_channel_background_service_descr">Allows receiving calls and messages anytime.</string>
<string name="notif_group_calls">Calls</string> <string name="notif_group_calls">Calls</string>
<string name="notif_inprogress_group_call">Call in progress</string> <string name="notif_inprogress_group_call">Call in progress</string>
<string name="notif_background_service">Jami is currently running in background</string> <string name="notif_background_service">Jami is currently running in the background</string>
<string name="notif_mark_as_read">Mark as read</string> <string name="notif_mark_as_read">Mark as read</string>
<string name="notif_dismiss">Dismiss</string> <string name="notif_dismiss">Dismiss</string>
<string name="notif_reply">Reply</string> <string name="notif_reply">Reply</string>
...@@ -235,8 +234,7 @@ along with this program; if not, write to the Free Software ...@@ -235,8 +234,7 @@ along with this program; if not, write to the Free Software
<string name="hist_in_call">Incoming call of %1$s</string> <string name="hist_in_call">Incoming call of %1$s</string>
<string name="hist_out_call">Outgoing call of %1$s</string> <string name="hist_out_call">Outgoing call of %1$s</string>
<string name="call_duration">Lasted %s</string> <string name="call_duration">Lasted %s</string>
<string name="start_error_title">Cannot start Jami!</string> <string name="start_error_title">Unable to start Jami</string>
<string name="start_error_mic_required">Jami requires the microphone permission to work.</string>
<string name="action_call_accept">Accept call</string> <string name="action_call_accept">Accept call</string>
<string name="action_call_accept_audio">Accept incoming call with audio only</string> <string name="action_call_accept_audio">Accept incoming call with audio only</string>
<string name="action_call_accept_video">Accept incoming call with video</string> <string name="action_call_accept_video">Accept incoming call with video</string>
...@@ -253,7 +251,7 @@ along with this program; if not, write to the Free Software ...@@ -253,7 +251,7 @@ along with this program; if not, write to the Free Software
<string name="ab_action_video_call">Start video call</string> <string name="ab_action_video_call">Start video call</string>
<string name="ab_action_change_screen_orientation">Change screen orientation</string> <string name="ab_action_change_screen_orientation">Change screen orientation</string>
<string name="share_via">Share via</string> <string name="share_via">Share via</string>
<string name="write_a_message">Write a message</string> <string name="write_a_message">Write message</string>
<string name="scan_qr">Scan QR Code</string> <string name="scan_qr">Scan QR Code</string>
<string name="qr_code">QR Code</string> <string name="qr_code">QR Code</string>
<string name="qr_code_not_contact">Not a Jami contact QR code</string> <string name="qr_code_not_contact">Not a Jami contact QR code</string>
...@@ -274,13 +272,13 @@ along with this program; if not, write to the Free Software ...@@ -274,13 +272,13 @@ along with this program; if not, write to the Free Software
<string name="conversation_send_audio">Record audio clip</string> <string name="conversation_send_audio">Record audio clip</string>
<string name="conversation_send_video">Record video clip</string> <string name="conversation_send_video">Record video clip</string>
<string name="conversation_share_location">Share location</string> <string name="conversation_share_location">Share location</string>
<string name="ongoing_group_call">Ongoing Call</string> <string name="ongoing_group_call">Ongoing call</string>
<string name="started_call">Started a call</string> <string name="started_call">Call started</string>
<string name="in_reply_to">In reply to</string> <string name="in_reply_to">In reply to</string>
<!-- MediaPreferenceFragment --> <!-- MediaPreferenceFragment -->
<string name="permission_dialog_camera_title">Camera permission</string> <string name="permission_dialog_camera_title">Camera permission</string>
<string name="permission_dialog_camera_message">Video conversations require the camera permission to work. Please consider enabling it.</string> <string name="permission_dialog_camera_message">Video conversations requires the camera permission. Camera permission is disabled. Enable it in device settings in order to use this feature.</string>
<string name="camera_error">An error occurred while starting the camera.</string> <string name="camera_error">An error occurred while starting the camera.</string>
<!-- Ringtone activity --> <!-- Ringtone activity -->
...@@ -294,15 +292,15 @@ along with this program; if not, write to the Free Software ...@@ -294,15 +292,15 @@ along with this program; if not, write to the Free Software
<string name="ca_root_file" translatable="false">cacert.pem</string> <string name="ca_root_file" translatable="false">cacert.pem</string>
<!-- Read contacts permission --> <!-- Read contacts permission -->
<string name="permission_dialog_read_contacts_message">Jami needs the “Read contacts” permission to enable this feature. Please grant it.</string> <string name="permission_dialog_read_contacts_message">Jami requires the “Read contacts” permission. Enable it in device settings in order to use this feature.</string>
<!-- Write call log permission --> <!-- Write call log permission -->
<string name="permission_dialog_write_call_log_message">Jami needs the “Write call log” permission to enable this feature. Please grant it.</string> <string name="permission_dialog_write_call_log_message">Jami requires the “Write call log” permission. Enable it in device settings in order to use this feature.</string>
<!-- QRCode Scan --> <!-- QRCode Scan -->
<string name="scan_qr_account_message">Scan the QR Code of the account you want to add.</string> <string name="scan_qr_account_message">Scan the QR Code of the account you want to add.</string>
<string name="title_activity_qrcode">Share my account</string> <string name="title_activity_qrcode">Share my account</string>
<string name="error_scan_no_camera_permissions">The QR scanner requires camera permissions to work</string> <string name="error_scan_no_camera_permissions">The QR scanner requires the camera permission. Camera permission is disabled. Enable it in device settings in order to use this feature.</string>
<string name="tab_code">My Code</string> <string name="tab_code">My Code</string>
<string name="tab_scan">Scan Code</string> <string name="tab_scan">Scan Code</string>
...@@ -370,16 +368,16 @@ along with this program; if not, write to the Free Software ...@@ -370,16 +368,16 @@ along with this program; if not, write to the Free Software
<string name="audio_recorder_error">Audio recorder app was not found.</string> <string name="audio_recorder_error">Audio recorder app was not found.</string>
<string name="video_recorder_error">Video recorder app was not found.</string> <string name="video_recorder_error">Video recorder app was not found.</string>
<string name="taking_picture_error">An error occurred while taking a picture.</string> <string name="taking_picture_error">An error occurred while taking the picture.</string>
<string name="find_picture_error">An error occurred while finding picture.</string> <string name="find_picture_error">An error occurred while finding the picture.</string>
<string name="open_camera_error">An error occurred while opening the camera.</string> <string name="open_camera_error">An error occurred while opening the camera.</string>
<string name="starting_recorder_error">An error occurred while starting the recorder.</string> <string name="starting_recorder_error">An error occurred while starting the recorder.</string>
<string name="starting_camera_error">An error occurred while starting the camera.</string> <string name="starting_camera_error">An error occurred while starting the camera.</string>
<string name="browser_error">No file browser available on this device.</string> <string name="browser_error">No file browser available on this device.</string>
<string name="import_archive_error">An error occurred while importing the archive.</string> <string name="import_archive_error">An error occurred while importing the archive.</string>
<string name="export_archive_error">An error occurred while exporting the archive.</string> <string name="export_archive_error">An error occurred while exporting the archive.</string>
<string name="load_ringtone_error">An error occurred while loading ringtone.</string> <string name="load_ringtone_error">An error occurred while loading the ringtone.</string>
<string name="sharing_log_error">An error occurred while sharing logs.</string> <string name="sharing_log_error">An error occurred while sharing the logs.</string>
<string name="no_native_crash">No recent native crash</string> <string name="no_native_crash">No recent native crash</string>
<string name="today">Today</string> <string name="today">Today</string>
...@@ -410,10 +408,10 @@ along with this program; if not, write to the Free Software ...@@ -410,10 +408,10 @@ along with this program; if not, write to the Free Software
<!-- Account summary --> <!-- Account summary -->
<string name="profile">Profile</string> <string name="profile">Profile</string>
<string name="profile_name">Profile Name</string> <string name="profile_name">Profile name</string>
<string name="profile_message_warning">Your profile is only shared with your contacts</string> <string name="profile_message_warning">Your profile is only shared with your contacts</string>
<string name="open_the_gallery">Open the gallery</string> <string name="open_the_gallery">Open the gallery</string>
<string name="take_a_photo">Take a photo</string> <string name="take_a_photo">Take photo</string>
<string name="profile_name_hint">Enter your name</string> <string name="profile_name_hint">Enter your name</string>
<string name="registered_name">Registered Name</string> <string name="registered_name">Registered Name</string>
<string name="no_registered_name">No name registered</string> <string name="no_registered_name">No name registered</string>
...@@ -431,7 +429,7 @@ along with this program; if not, write to the Free Software ...@@ -431,7 +429,7 @@ along with this program; if not, write to the Free Software
<string name="share_contact_information">Share contact information</string> <string name="share_contact_information">Share contact information</string>
<string name="share_label">Share</string> <string name="share_label">Share</string>
<string name="generic_error_migration">Error</string> <string name="generic_error_migration">Error</string>
<string name="generic_error_migration_message">An error occurred during migration</string> <string name="generic_error_migration_message">An error occurred while migrating the account.</string>
<string name="title_share_with">Share with…</string> <string name="title_share_with">Share with…</string>
<!-- Pending invitations --> <!-- Pending invitations -->
...@@ -519,11 +517,11 @@ along with this program; if not, write to the Free Software ...@@ -519,11 +517,11 @@ along with this program; if not, write to the Free Software
<string name="tv_send_video">Send Media</string> <string name="tv_send_video">Send Media</string>
<string name="tv_action_more">More</string> <string name="tv_action_more">More</string>
<string name="conversation_input_speech_hint">Say something…</string> <string name="conversation_input_speech_hint">Say something…</string>
<string name="audio_permission_denied">Please grant access to the microphone to use Jami audio features.</string> <string name="audio_permission_denied">Microphone permission is disabled. Enable it in device settings in order to use this feature.</string>
<string name="camera_permission_denied">Please grant access to the camera to use Jami video features.</string> <string name="camera_permission_denied">Camera permission is disabled. Enable it in device settings in order to use this feature.</string>
<string name="speech_recogniton_unavailable">Speech recognition is not available.</string> <string name="speech_recogniton_unavailable">Speech recognition is not available.</string>
<string name="audio_permission_rationale_title">Audio permission required</string> <string name="audio_permission_rationale_title">Audio permission required</string>
<string name="camera_permission_rationale_title">Video permission required</string> <string name="camera_permission_rationale_title">Camera permission required</string>
<string name="audio_permission_rationale_message">Jami requires the microphone permission to use speech-to-text and record audio features. It will be asked in the next step.</string> <string name="audio_permission_rationale_message">Jami requires the microphone permission to use speech-to-text and record audio features. It will be asked in the next step.</string>
<string name="camera_permission_rationale_message">Jami requires the camera permission to record video and place video call. It will be asked in the next step.</string> <string name="camera_permission_rationale_message">Jami requires the camera permission to record video and place video call. It will be asked in the next step.</string>
<string name="unable_to_start_recorder">Unable to start recording audio.</string> <string name="unable_to_start_recorder">Unable to start recording audio.</string>
......
...@@ -213,15 +213,15 @@ along with this program; if not, write to the Free Software ...@@ -213,15 +213,15 @@ along with this program; if not, write to the Free Software
<string name="account_update_needed">Update needed</string> <string name="account_update_needed">Update needed</string>
<string name="account_cannot_be_found_title">Account error</string> <string name="account_cannot_be_found_title">Account error</string>
<string name="account_cannot_be_found_message">Unable to find account on the Jami network. Make sure it was exported on Jami from an existing device, and that provided credentials are correct.</string> <string name="account_cannot_be_found_message">Unable to find account on the Jami network. Make sure it was exported on Jami from an existing device, and that provided credentials are correct.</string>
<string name="jams_account_cannot_be_found_message">An error occured while connecting the account. Please check credentials and try again.</string> <string name="jams_account_cannot_be_found_message">An error occurred while connecting the account. Please check credentials and try again.</string>
<string name="account_sip_cannot_be_registered_message">You can continue with the account creation process or edit your information here. Edition is still possible later in the account settings.</string> <string name="account_sip_cannot_be_registered_message">You can continue with the account creation process or edit your information here. Edition is still possible later in the account settings.</string>
<string name="account_no_network_title">Network error</string> <string name="account_no_network_title">Network error</string>
<string name="account_no_network_message">A connectivity error occurred while adding Jami account to the distributed network. Check your device connectivity.</string> <string name="account_no_network_message">A connectivity error occurred while adding the Jami account to the distributed network. Check your device connectivity.</string>
<string name="account_device_added_title">Account device added</string> <string name="account_device_added_title">Account device added</string>
<string name="account_device_added_message">Jami account set up successfully on this device.</string> <string name="account_device_added_message">Jami account set up successfully on this device.</string>
<string name="account_device_updated_title">Account device updated</string> <string name="account_device_updated_title">Account device updated</string>
<string name="account_device_updated_message">Jami account updated successfully.</string> <string name="account_device_updated_message">Jami account updated successfully.</string>
<string name="account_cannot_be_updated_message">An error occurred while updating account. Please check your password.</string> <string name="account_cannot_be_updated_message">An error occurred while updating the account. Please check account password.</string>
<string name="account_sip_success_title">SIP account registered</string> <string name="account_sip_success_title">SIP account registered</string>
<string name="account_sip_success_message">SIP account registered successfully.</string> <string name="account_sip_success_message">SIP account registered successfully.</string>
<string name="account_sip_register_anyway">Register anyway</string> <string name="account_sip_register_anyway">Register anyway</string>
...@@ -286,7 +286,7 @@ along with this program; if not, write to the Free Software ...@@ -286,7 +286,7 @@ along with this program; if not, write to the Free Software
<string name="account_creation_profile">Create your profile</string> <string name="account_creation_profile">Create your profile</string>
<string name="account_creation_ring">Create your Jami account</string> <string name="account_creation_ring">Create your Jami account</string>
<string name="account_link_title">Link this device</string> <string name="account_link_title">Link this device</string>
<string name="account_sip_cannot_be_registered">An error occurred while registering SIP account.</string> <string name="account_sip_cannot_be_registered">An error occurred while registering the SIP account.</string>
<!-- Edit profile--> <!-- Edit profile-->
<string name="account_edit_profile">Edit profile</string> <string name="account_edit_profile">Edit profile</string>
...@@ -295,7 +295,7 @@ along with this program; if not, write to the Free Software ...@@ -295,7 +295,7 @@ along with this program; if not, write to the Free Software
<string name="account_revoke_device_hint">Enter password to confirm</string> <string name="account_revoke_device_hint">Enter password to confirm</string>
<string name="enter_password">Enter password</string> <string name="enter_password">Enter password</string>
<string name="revoke_device_title">Revoke device</string> <string name="revoke_device_title">Revoke device</string>
<string name="revoke_device_message">Are you sure you want to revoke %1$s?</string> <string name="revoke_device_message">Do you really want to revoke %1$s?</string>
<string name="revoke_device_wait_title">Please wait…</string> <string name="revoke_device_wait_title">Please wait…</string>
<string name="revoke_device_wait_message">Revoking device</string> <string name="revoke_device_wait_message">Revoking device</string>
<string name="rename_device_title">Rename this device</string> <string name="rename_device_title">Rename this device</string>
......
...@@ -50,10 +50,10 @@ ...@@ -50,10 +50,10 @@
<string name="pref_blackList_summary">Check your block list.</string> <string name="pref_blackList_summary">Check your block list.</string>
<string name="pref_delete_account_title">Delete account</string> <string name="pref_delete_account_title">Delete account</string>
<string name="pref_delete_account_summary">Delete your account from this device</string> <string name="pref_delete_account_summary">Delete account from this device</string>
<string name="pref_persistNotification_title">Run in background</string> <string name="pref_persistNotification_title">Run in the background</string>
<string name="pref_persistNotification_summary">Allow running in background to receive calls and messages.</string> <string name="pref_persistNotification_summary">Allow running in the background to receive calls and messages.</string>
<string name="pref_newGroup_title">Enable group chat</string> <string name="pref_newGroup_title">Enable group chat</string>
<string name="pref_newGroup_summary">Enable creating groups in Jami.</string> <string name="pref_newGroup_summary">Enable creating groups in Jami.</string>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<string name="extension_recent_version_exception">A more recent version of <b>%1$s</b> is installed.</string> <string name="extension_recent_version_exception">A more recent version of <b>%1$s</b> is installed.</string>
<string name="extension_same_version_exception">The same version of <b>%1$s</b> is installed.</string> <string name="extension_same_version_exception">The same version of <b>%1$s</b> is installed.</string>
<string name="extension_invalid_signature"><b>%1$s</b> has an invalid signature</string> <string name="extension_invalid_signature"><b>%1$s</b> has an invalid signature</string>
<string name="extension_invalid_authority">Cannot verify authority for: <b>%1$s</b></string> <string name="extension_invalid_authority">An error occurred while verifying the authority for the following extension: <b>%1$s</b></string>
<string name="extension_invalid_format">Invalid extension format: <b>%1$s</b></string> <string name="extension_invalid_format">Invalid extension format: <b>%1$s</b></string>
<string name="extension_force_install">force\ninstall</string> <string name="extension_force_install">force\ninstall</string>
<string name="extension_path_image_add">Add new image</string> <string name="extension_path_image_add">Add new image</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment