app: rename to Jami
Change-Id: Ifbc85e43e87c247efd61109c645058405d59b673
diff --git a/ring-android/app/src/main/res/values/colors.xml b/ring-android/app/src/main/res/values/colors.xml
index fb70976..285350d 100644
--- a/ring-android/app/src/main/res/values/colors.xml
+++ b/ring-android/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="color_primary_light">#3ac0d2</color>
- <color name="color_primary_dark">#004C60</color>
+ <color name="color_primary_light">#28B1ED</color>
+ <color name="color_primary_dark">#000747</color>
<color name="darker_gray">#aaaaaa</color>
<color name="lighter_gray">#d3d3d3</color>
diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
index 89e6177..89f8f99 100644
--- a/ring-android/app/src/main/res/values/strings.xml
+++ b/ring-android/app/src/main/res/values/strings.xml
@@ -21,18 +21,18 @@
<resources>
<!-- About -->
- <string name="app_name" translatable="false">Ring</string>
+ <string name="app_name" translatable="false">Jami</string>
<string name="app_author" translatable="false">Savoir-faire Linux Inc.</string>
<string name="app_release" translatable="false">Live Free or Die - %1$s</string>
- <string name="app_website_contribute" translatable="false"><u>https://ring.cx/contribute</u></string>
+ <string name="app_website_contribute" translatable="false"><u>https://jami.net/contribute</u></string>
<string name="gnu_license_website" translatable="false">https://www.gnu.org/licenses/gpl.html</string>
- <string name="ring_contribute_website" translatable="false">https://ring.cx/contribute</string>
+ <string name="ring_contribute_website" translatable="false">https://jami.net/contribute</string>
<string name="copyright" translatable="false">2004–2018 Savoir-faire Linux Inc.</string>
<string name="feedback_section">Feedback</string>
- <string name="report"><u>Send us an email</u></string>
+ <string name="report"><u>Send us an email</u></string>
<string name="section_license">License</string>
- <string name="sponsor_section">Ring is a free software developed and supported by</string>
+ <string name="sponsor_section">Jami is a free software developed and supported by</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Contribute</string>
<string name="version_section">Version</string>
@@ -40,9 +40,8 @@
<string name="no_browser_app_installed">No web browser app found, install one to view this page</string>
<string name="email_chooser_title">Send mail 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="description">Ring is free software for universal communication which respects the freedoms and privacy of its users.</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="credits">Credits</string>
<!-- About dialog -->
@@ -69,7 +68,7 @@
<string name="menu_item_account">Manage account</string>
<string name="menu_item_settings">Settings</string>
<string name="menu_item_share">Share my contact</string>
- <string name="menu_item_about">About Ring</string>
+ <string name="menu_item_about">About Jami</string>
<!-- Dialing Fragment -->
<string name="dial_number">Dial a number</string>
@@ -109,7 +108,7 @@
<string name="notif_channel_file_transfer">File transfer</string>
<string name="notif_channel_background_service">Background service</string>
<string name="notif_channel_background_service_descr">Allows receiving calls and messages anytime.</string>
- <string name="notif_background_service">Ring is currently running in background</string>
+ <string name="notif_background_service">Jami is currently running in background</string>
<string name="notif_mark_as_read">Mark as read</string>
<string name="notif_dismiss">Dismiss</string>
<string name="notif_reply">Reply</string>
@@ -126,8 +125,8 @@
<string name="ongoing_call">Ongoing call</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="start_error_title">Can\'t start Ring !</string>
- <string name="start_error_mic_required">Ring requires the microphone permission to work.</string>
+ <string name="start_error_title">Can\'t start Jami !</string>
+ <string name="start_error_mic_required">Jami requires the microphone permission to work.</string>
<string name="action_call_accept">Take call</string>
<string name="action_call_decline">Decline</string>
<string name="action_call_mic_mute">Mute microphone</string>
@@ -161,10 +160,10 @@
<string name="ringtone_error_size_too_big">This file is too big. The maximum size is %1$dkB.</string>
<!-- Read contacts permission -->
- <string name="permission_dialog_read_contacts_message">Ring needs the "Read contacts" permission to enable this feature. Please grant it.</string>
+ <string name="permission_dialog_read_contacts_message">Jami needs the "Read contacts" permission to enable this feature. Please grant it.</string>
<!-- Write call log permission -->
- <string name="permission_dialog_write_call_log_message">Ring needs the "Write call log" permission to enable this feature. Please grant it.</string>
+ <string name="permission_dialog_write_call_log_message">Jami needs the "Write call log" permission to enable this feature. Please grant it.</string>
<!-- QRCode Scan -->
<string name="scan_qr_account_message">Scan the QR Code of the account you want to add.</string>
@@ -198,11 +197,11 @@
<string name="prompt_new_password">New password</string>
<string name="prompt_new_password_optional">New password (optional)</string>
<string name="prompt_new_password_repeat">Repeat new password</string>
- <string name="account_create_title">Create a Ring account</string>
+ <string name="account_create_title">Create a Jami account</string>
<string name="prompt_new_username">Enter new username</string>
- <string name="help_password_choose">Choose a strong password you will remember to protect your Ring account.</string>
- <string name="help_password_enter">Enter your main Ring account password</string>
- <string name="help_pin_enter">Enter the PIN from another configured Ring account. Use the \"export account on Ring\" feature to obtain a PIN.</string>
+ <string name="help_password_choose">Choose a strong password you will remember to protect your Jami account.</string>
+ <string name="help_password_enter">Enter your main Jami account password</string>
+ <string name="help_pin_enter">Enter the PIN from another configured Jami account. Use the \"export Jami account\" feature to obtain a PIN.</string>
<string name="wizard_next">Next</string>
<string name="wizard_back">Back</string>
<string name="wizard_skip">Skip</string>
@@ -215,7 +214,7 @@
<string name="profile_name_hint">Enter your name (optional)</string>
<!-- Share fragment -->
- <string name="share_message">Scan this code with Ring</string>
+ <string name="share_message">Scan this code with Jami</string>
<string name="share_message_no_account">Please select an account to share.</string>
<string name="share_your_account_information">Share my contact information</string>
<string name="generic_error_migration">Error</string>
diff --git a/ring-android/app/src/main/res/values/strings_account.xml b/ring-android/app/src/main/res/values/strings_account.xml
index e730486..40335e4 100644
--- a/ring-android/app/src/main/res/values/strings_account.xml
+++ b/ring-android/app/src/main/res/values/strings_account.xml
@@ -26,7 +26,7 @@
<string name="ic_blacklist_menu">Blocked contacts</string>
<!-- Strings related to account creation -->
- <string name="add_ring_account_title">Add Ring account</string>
+ <string name="add_ring_account_title">Add Jami account</string>
<string name="add_sip_account_title">Add SIP account</string>
<string name="ring_account_default_name">Ring account %1$s</string>
@@ -51,7 +51,7 @@
You can edit your account later</string>
<string name="account_type_ip2ip">IP account</string>
- <string name="help_ring">A Ring account allows you to reach people securely in peer to peer through a fully distributed network.</string>
+ <string name="help_ring">A Jami account allows you to reach people securely in peer to peer through a fully distributed network.</string>
<string name="help_sip_title">Add your SIP account</string>
<string name="help_sip">Configure an existing SIP account.</string>
@@ -64,7 +64,7 @@
<!-- AccountManagementFragment -->
<string name="empty_account_list">No account registered</string>
<string name="normal_accounts_titles">Accounts</string>
- <string name="normal_devices_titles">Known devices linked to this Ring account</string>
+ <string name="normal_devices_titles">Known devices linked to this Jami account</string>
<string name="account_device_revoke">Revoke device</string>
<string name="account_device_revocation_success_title">Success</string>
<string name="account_device_revocation_success">Device is now revoked!</string>
@@ -162,25 +162,25 @@
<string name="account_export_end_error_title">Error</string>
<string name="account_export_end_error_message">Couldn\'t export account. An unknown error occurred.</string>
<string name="account_enter_password">Enter password</string>
- <string name="account_share_body">Contact me using \'%1$s\' on the Ring distributed communication platform: https://ring.cx</string>
- <string name="account_share_body_with_username">Contact me using \'%1$s\' or my public username \'%2$s\' on the Ring distributed communication platform: https://ring.cx</string>
- <string name="account_contact_me">Contact me on Ring !</string>
+ <string name="account_share_body">Contact me using \'%1$s\' on the Jami distributed communication platform: https://ring.cx</string>
+ <string name="account_share_body_with_username">Contact me using \'%1$s\' or my public username \'%2$s\' on the Jami distributed communication platform: https://ring.cx</string>
+ <string name="account_contact_me">Contact me on Jami !</string>
<string name="update_account">Update account</string>
- <string name="account_migration">Your Ring account can be updated.\nPlease enter your password.</string>
+ <string name="account_migration">Your Jami account can be updated.\nPlease enter your password.</string>
<string name="ring_account">Ring account</string>
<string name="ring_account_identity">Identity</string>
<string name="account_migration_title_dialog">Account migration</string>
<string name="account_migration_message_dialog">Your accounts need to be updated. Do you want to go the Account management screen to perform this operation ?</string>
<string name="account_update_needed">Update needed</string>
<string name="account_cannot_be_found_title">Can\'t find account</string>
- <string name="account_cannot_be_found_message">Account couldn\'t be found on the Ring network.\nMake sure it was exported on Ring from an existing device, and that provided credentials are correct.</string>
+ <string name="account_cannot_be_found_message">Account couldn\'t be found on the Jami network.\nMake sure it was exported on Jami from an existing device, and that provided credentials are correct.</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">Can\'t connect to the network</string>
- <string name="account_no_network_message">Could not add account because Ring coudn\'t connect to the distributed network. Check your device connectivity.</string>
+ <string name="account_no_network_message">Could not add account because Jami coudn\'t connect to the distributed network. Check your device connectivity.</string>
<string name="account_device_added_title">Account device added</string>
- <string name="account_device_added_message">You have successfully setup your Ring account on this device.</string>
+ <string name="account_device_added_message">You have successfully setup your Jami account on this device.</string>
<string name="account_device_updated_title">Account device updated</string>
- <string name="account_device_updated_message">You have successfully updated your Ring account.</string>
+ <string name="account_device_updated_message">You have successfully updated your Jami account.</string>
<string name="account_cannot_be_updated_message">Account device couldn\'t be update. Please check your password.</string>
<string name="account_sip_success_title">Sip account registered</string>
<string name="account_sip_success_message">You have successfully registered your Sip account.</string>
@@ -188,13 +188,13 @@
<string name="account_link_button">Link this device to an account</string>
<string name="account_link_prompt_pin">Enter PIN</string>
- <string name="account_new_button">Create a Ring account</string>
+ <string name="account_new_button">Create a Jami account</string>
<string name="account_link_export_button">Link another device to this account</string>
- <string name="account_link_export_info">To use this account on other devices, you must first expose it on Ring. This will generate a PIN code that you must enter on the new device to set up the account. The PIN is valid for 10 minutes.</string>
+ <string name="account_link_export_info">To use this account on other devices, you must first expose it on Jami. This will generate a PIN code that you must enter on the new device to set up the account. The PIN is valid for 10 minutes.</string>
<string name="account_start_export_button">Generate PIN</string>
<string name="account_end_export_button">close</string>
- <string name="account_end_export_infos">Your PIN is:\n\n%%\n\nTo complete the process, you need to open Ring on the new device. Create a new account with \"Link this device to an account\". Your PIN is valid for 10 minutes.</string>
- <string name="account_link_export_info_light">To use this account on other devices, you must first expose it on Ring. This will generate a PIN code that you must enter on the new device to set up the account. The PIN is valid for 10 minutes.</string>
+ <string name="account_end_export_infos">Your PIN is:\n\n%%\n\nTo complete the process, you need to open Jami on the new device. Create a new account with \"Link this device to an account\". Your PIN is valid for 10 minutes.</string>
+ <string name="account_link_export_info_light">To use this account on other devices, you must first expose it on Jami. This will generate a PIN code that you must enter on the new device to set up the account. The PIN is valid for 10 minutes.</string>
<string name="account_export_title">Add devices</string>
<!-- Name registration -->
@@ -214,9 +214,9 @@
<string name="account_status_offline">Offline</string>
<!-- Create account -->
- <string name="account_creation_home">Welcome to Ring</string>
+ <string name="account_creation_home">Welcome to Jami</string>
<string name="account_creation_profile">Create your profile</string>
- <string name="account_creation_ring">Create your Ring account</string>
+ <string name="account_creation_ring">Create your Jami account</string>
<string name="account_link_title">Link this device</string>
<string name="account_sip_cannot_be_registered">Can\'t register account</string>
@@ -231,7 +231,7 @@
<string name="revoke_device_wait_title">Please wait…</string>
<string name="revoke_device_wait_message">Revoking device</string>
<string name="rename_device_title">Rename this device</string>
- <string name="rename_device_message">Choose a new name to identify this device in your Ring account</string>
+ <string name="rename_device_message">Choose a new name to identify this device in your Jami account</string>
<string name="rename_device_button">Rename device</string>
<string name="account_rename_device_hint">Choose new device name</string>
<string name="account_device_name_empty">Device name can\'t be empty</string>
diff --git a/ring-android/app/src/main/res/values/strings_preferences.xml b/ring-android/app/src/main/res/values/strings_preferences.xml
index bc91ced..f6be7c4 100644
--- a/ring-android/app/src/main/res/values/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values/strings_preferences.xml
@@ -6,7 +6,7 @@
<string name="pref_category_privacy">Privacy</string>
<string name="pref_mobileData_title">Mobile data</string>
- <string name="pref_mobileData_summary">Allow Ring on 3G/LTE networks additionally to Wi-Fi</string>
+ <string name="pref_mobileData_summary">Allow Jami on 3G/LTE networks additionally to Wi-Fi</string>
<string name="pref_pushNotifications_title">Push notifications</string>
<string name="pref_pushNotifications_summary">Use Google servers to allow receiving calls/messages in the background</string>
@@ -21,11 +21,11 @@
<string name="pref_systemCamera_key" translatable="false">pref_systemCamera</string>
<string name="pref_systemDialer_key" translatable="false">pref_systemDialer</string>
- <string name="pref_systemDialer_title">Place system calls using Ring</string>
- <string name="pref_systemDialer_summary">Use Ring to place system calls when possible.</string>
+ <string name="pref_systemDialer_title">Place system calls using Jami</string>
+ <string name="pref_systemDialer_summary">Use Jami to place system calls when possible.</string>
- <string name="pref_startOnBoot_title">Start Ring on startup</string>
- <string name="pref_startOnBoot_summary">Run Ring in the background when the system starts.</string>
+ <string name="pref_startOnBoot_title">Start Jami on startup</string>
+ <string name="pref_startOnBoot_summary">Run Jami in the background when the system starts.</string>
<string name="pref_clearHistory_title">Clear history</string>
<string name="pref_clearHistory_summary">Clear all the conversations history. This action can not be undone.</string>
diff --git a/ring-android/app/src/main/res/values/styles.xml b/ring-android/app/src/main/res/values/styles.xml
index 99203c9..3a0ec79 100644
--- a/ring-android/app/src/main/res/values/styles.xml
+++ b/ring-android/app/src/main/res/values/styles.xml
@@ -71,10 +71,10 @@
<item name="android:textColor">@color/text_color_secondary</item>
</style>
- <style name="Wizard" parent="Theme.MaterialComponents">
+ <style name="Wizard" parent="Theme.MaterialComponents.Light">
<item name="colorAccent">@color/color_primary_light</item>
- <item name="colorPrimary">@color/color_primary_dark</item>
- <item name="colorPrimaryDark">@color/color_primary_light</item>
+ <item name="colorPrimary">@color/color_primary_light</item>
+ <item name="colorPrimaryDark">@color/color_primary_dark</item>
</style>
<style name="WizardNavButton" parent="Widget.AppCompat.Button.Borderless.Colored">
@@ -96,7 +96,7 @@
</style>
<style name="ButtonColored" parent="Widget.AppCompat.Button.Colored">
- <item name="colorButtonNormal">@color/color_primary_dark</item>
+ <item name="colorButtonNormal">@color/color_primary_light</item>
<item name="android:textColor">@color/text_color_primary_dark</item>
</style>