* #30787: removed hardcoded strings
added french support
diff --git a/res/layout/clearable_edit_text.xml b/res/layout/clearable_edit_text.xml
index 07d3de8..a55dc26 100644
--- a/res/layout/clearable_edit_text.xml
+++ b/res/layout/clearable_edit_text.xml
@@ -7,7 +7,7 @@
android:id="@+id/clearable_edit"
android:layout_width="match_parent"
android:layout_height="50dp"
- android:hint="Type phone number"
+ android:hint="@string/dial_hint"
android:paddingRight="35dip" />
<Button
diff --git a/res/layout/dialog_transfer.xml b/res/layout/dialog_transfer.xml
index 8aa394e..76554eb 100644
--- a/res/layout/dialog_transfer.xml
+++ b/res/layout/dialog_transfer.xml
@@ -9,7 +9,7 @@
android:id="@+id/transfer_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Transfer to another current call:" />
+ android:text="@string/transfer_to_another_call" />
<ListView
android:id="@+id/concurrent_calls"
@@ -23,14 +23,14 @@
android:id="@+id/empty_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="No other calls pending"
+ android:text="@string/transfer_no_other_call"
android:gravity="center" />
<TextView
android:id="@+id/lbl_your_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Type number to transfer to:" />
+ android:text="@string/transfer_type_number" />
<AutoCompleteTextView
android:id="@+id/external_number"
diff --git a/res/layout/expandable_child.xml b/res/layout/expandable_child.xml
index 488398d..9f85a59 100644
--- a/res/layout/expandable_child.xml
+++ b/res/layout/expandable_child.xml
@@ -11,7 +11,7 @@
android:layout_weight="1"
android:tag="hold"
android:textSize="12sp"
- android:text="Hold" />
+ android:text="@string/action_call_hold" />
<Button
android:id="@+id/action_conf"
@@ -19,7 +19,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:textSize="12sp"
- android:text="Conference" />
+ android:text="@string/action_call_conference" />
<Button
android:id="@+id/action_transfer"
@@ -27,7 +27,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:textSize="12sp"
- android:text="Transfer" />
+ android:text="@string/action_call_general_transfer" />
<ImageButton
android:id="@+id/action_hangup"
diff --git a/res/layout/frag_about.xml b/res/layout/frag_about.xml
index 3d9dea5..3f5acb3 100644
--- a/res/layout/frag_about.xml
+++ b/res/layout/frag_about.xml
@@ -7,6 +7,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:orientation="vertical" >
<ImageView
@@ -24,12 +25,22 @@
android:gravity="center"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <TextView
+ android:id="@+id/web_site"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:layout_below="@+id/app_name"
+ android:text="@string/web_site"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/licence"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/app_name"
+ android:layout_below="@+id/web_site"
+ android:layout_centerHorizontal="true"
android:text="@string/copyright"
android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
diff --git a/res/layout/frag_account_creation.xml b/res/layout/frag_account_creation.xml
index fa40fe0..bb4983a 100644
--- a/res/layout/frag_account_creation.xml
+++ b/res/layout/frag_account_creation.xml
@@ -14,7 +14,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_alias"
- android:inputType="textEmailAddress"
+ android:typeface="monospace"
android:maxLines="1"
android:singleLine="true" >
@@ -26,6 +26,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_hostname"
+ android:typeface="monospace"
android:maxLines="1"
android:singleLine="true" >
</EditText>
@@ -35,6 +36,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_username"
+ android:typeface="monospace"
android:maxLines="1"
android:singleLine="true" />
@@ -46,6 +48,7 @@
android:imeActionId="@+id/login"
android:imeActionLabel="@string/action_create_short"
android:imeOptions="actionUnspecified"
+ android:typeface="sans"
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true" />
diff --git a/res/layout/frag_contact_list.xml b/res/layout/frag_contact_list.xml
index 7c1d1f4..7d858ae 100644
--- a/res/layout/frag_contact_list.xml
+++ b/res/layout/frag_contact_list.xml
@@ -55,13 +55,7 @@
android:layout_gravity="center"
android:gravity="center"
android:textSize="40sp"
- android:text="No contact found" />
+ android:text="@string/no_contact_found" />
- <!-- <TextView -->
- <!-- android:id="@+id/empty_list_starred" -->
- <!-- android:layout_width="match_parent" -->
- <!-- android:layout_height="match_parent" -->
- <!-- android:gravity="center" -->
- <!-- android:text="No data" /> -->
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/frag_history.xml b/res/layout/frag_history.xml
index 52598c8..d33694c 100644
--- a/res/layout/frag_history.xml
+++ b/res/layout/frag_history.xml
@@ -21,7 +21,7 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
- android:text="No history"
+ android:text="@string/no_history"
android:textSize="30sp" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/frag_home.xml b/res/layout/frag_home.xml
index d79e466..95b0623 100644
--- a/res/layout/frag_home.xml
+++ b/res/layout/frag_home.xml
@@ -59,7 +59,6 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
- android:text="0"
android:textSize="40sp" />
<TextView
@@ -67,7 +66,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
- android:text="Calls"
+ android:text="@string/home_calls_title"
android:textSize="30sp" />
</LinearLayout>
@@ -101,7 +100,6 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
- android:text="0"
android:textSize="40sp" />
<TextView
@@ -109,7 +107,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
- android:text="Conferences"
+ android:text="@string/home_conferences_title"
android:textSize="30sp" />
</LinearLayout>
@@ -121,13 +119,5 @@
</ListView>
</RelativeLayout>
- <Button
- android:id="@+id/access_callactivity"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/confs_layouts"
- android:layout_centerHorizontal="true"
- android:text="Go to current calls"
- android:visibility="gone" />
</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/frag_menu.xml b/res/layout/frag_menu.xml
index 8e38657..f6d429b 100644
--- a/res/layout/frag_menu.xml
+++ b/res/layout/frag_menu.xml
@@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:paddingBottom="2dip"
android:paddingLeft="5dip"
- android:text="Accounts"
+ android:text="@string/frag_menu_accounts_title"
android:paddingTop="2dip" />
<Spinner
diff --git a/res/layout/item_account.xml b/res/layout/item_account.xml
index 14f9e71..7554fb3 100644
--- a/res/layout/item_account.xml
+++ b/res/layout/item_account.xml
@@ -1,37 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="4dp" >
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="4dp" >
<TextView
- android:id="@+id/account_alias"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:layout_marginBottom="4dp"
- android:layout_marginLeft="4dp"
- android:text=""
- android:textAppearance="?android:attr/textAppearanceLarge" />
+ android:id="@+id/account_alias"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginBottom="4dp"
+ android:layout_marginLeft="4dp"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
- android:id="@+id/account_host"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/account_alias"
- android:layout_marginLeft="4dp"
- android:text=""
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <RadioButton
+ android:id="@+id/account_host"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_below="@+id/account_alias"
+ android:layout_marginLeft="4dp"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
+ <RadioButton
android:id="@+id/account_checked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:focusable="false"
- android:clickable="false"
android:layout_alignParentRight="true"
- android:layout_centerVertical="true"/>
+ android:layout_centerVertical="true"
+ android:clickable="false"
+ android:focusable="false" />
</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/item_history.xml b/res/layout/item_history.xml
index 065cff1..12caefc 100644
--- a/res/layout/item_history.xml
+++ b/res/layout/item_history.xml
@@ -103,7 +103,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/padding_small"
- android:text="Replay"
+ android:text="@string/replay_button"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone" />
</LinearLayout>
diff --git a/res/menu/account_edition.xml b/res/menu/account_edition.xml
index 178aa35..f6e9eaa 100644
--- a/res/menu/account_edition.xml
+++ b/res/menu/account_edition.xml
@@ -11,5 +11,5 @@
android:id="@+id/menuitem_edit"
android:title="@string/ab_account_edition_2"
android:showAsAction="ifRoom"
- android:icon="@android:drawable/ic_menu_edit"/>
+ android:icon="@android:drawable/ic_menu_save"/>
</menu>
\ No newline at end of file
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
new file mode 100644
index 0000000..ec14928
--- /dev/null
+++ b/res/values-fr/strings.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
+
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Additional permission under GNU GPL version 3 section 7:
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.
+-->
+
+<resources>
+
+ <string name="app_name">SFLphone</string>
+
+ <!-- SFLPhoneActivity -->
+ <string name="close_msg">Appuyer de nouveau pour quitter</string>
+ <string name="title_section0">Numéroter</string>
+ <string name="title_section1">Appeller</string>
+ <string name="title_section2">Historique</string>
+ <string name="title_activity_sflphone_home">SFLphone</string>
+ <string name="create_new_account_dialog_title">Aucun compte SIP enregistré</string>
+ <string name="create_new_account_dialog">Voulez-vous enregistrer un compte maintenant?</string>
+
+ <!-- AB menus -->
+ <string name="ab_account_creation">Nouveau compte</string>
+ <string name="ab_account_edition_1">Supprimer</string>
+ <string name="ab_account_edition_2">Éditer</string>
+
+ <!-- Left Drawer -->
+ <!-- Accessibility -->
+ <string name="drawer_open">Ouvrir le tiroir de navigation</string>
+ <string name="drawer_close">Fermer le tiroir de navigation</string>
+
+ <!-- Categories -->
+ <string name="frag_menu_accounts_title">Comptes</string>
+ <string name="menu_category_settings">Paramètres</string>
+ <string name="menu_category_help">Aide</string>
+
+ <!-- Settings -->
+ <string name="menu_item_settings_advanced">Gérer les comptes</string>
+ <string name="menu_item_settings_audio">Audio</string>
+ <string name="menu_item_settings_interface">Interface</string>
+
+ <!-- Dialing Fragment -->
+ <string name="error_no_number_dialed">Composez un numéro</string>
+ <string name="dial_hint">Entrez un numéro</string>
+
+ <!-- History Fragment -->
+ <string name="replay_button">Écouter</string>
+ <string name="no_history">Pas d\'historique</string>
+
+ <!-- Home Fragment -->
+ <string name="home_conferences_title">Conférences</string>
+ <string name="home_calls_title">Appels</string>
+
+ <!-- ContactList Fragment -->
+ <string name="no_contact_found">Aucun contact trouvé</string>
+
+ <!-- TransferDFragment -->
+ <string name="transfer_to_another_call">Transfert avec un autre appel</string>
+ <string name="transfer_no_other_call">Aucun appel</string>
+ <string name="transfer_type_number">Entrez un numéro</string>
+
+ <!-- Help -->
+ <string name="menu_item_help_gestures">Gestures</string>
+ <string name="menu_item_about">À propos de SFLphone</string>
+
+
+ <!-- Preferences -->
+ <string name="preference_section1">Comptes</string>
+ <string name="preference_section2">Audio</string>
+ <string name="account_preferences">Préférences de compte</string>
+ <string name="account_preferences_basic">Basic Account Preferences</string>
+ <string name="account_preferences_advanced">Advanced Account Preferences</string>
+ <string name="account_preferences_srtp">SRTP Account Preferences</string>
+ <string name="account_preferences_tls">TLS Account Preferences</string>
+ <string name="audio_preferences">Audio Preferences</string>
+ <string name="account_hostname_label">Hostname</string>
+ <string name="account_username_label">Username</string>
+ <string name="account_routeset_label">Route Set</string>
+ <string name="account_password_label">Password</string>
+ <string name="account_realm_label">Realm</string>
+ <string name="account_useragent_label">User Agent</string>
+ <string name="account_autoanswer_label">Auto Answer</string>
+ <string name="account_type_label">Account Type</string>
+ <string name="account_alias_label">Alias</string>
+ <string name="account_mailbox_label">Mailbox</string>
+ <string name="account_enabled_label">Account Enabled</string>
+ <string name="account_registration_exp_label">Registration Expire</string>
+ <string name="account_registration_status_label">Registration Status</string>
+ <string name="account_registration_code_label">Registration Code</string>
+ <string name="account_registration_state_label">Registration State</string>
+ <string name="account_credential_count_label">Credential Count</string>
+ <string name="account_config_dtmf_type_label">overrtp</string>
+ <string name="account_ringtone_path_label">Ringtone</string>
+ <string name="account_ringtone_enabled_label">Ringtone Enabled</string>
+ <string name="account_keep_alive_label">Keep Alive</string>
+ <string name="account_local_interface_label">Local Interface</string>
+ <string name="account_published_same_as_local_label">Published Port Same As Local</string>
+ <string name="account_local_port_label">Local Port</string>
+ <string name="account_published_port_label">Published Port</string>
+ <string name="account_published_address_label">Published Address</string>
+ <string name="account_displayname_label">Displayname Label</string>
+ <string name="account_stun_server_label">Stun Server</string>
+ <string name="account_stun_enable_label">Stun Enabled</string>
+ <string name="account_srtp_enabled_label">SRTP Enabled</string>
+ <string name="account_srtp_exchange_label">SRTP Key Exchange</string>
+ <string name="account_encryption_algo_label">Encryption Algo</string>
+ <string name="account_srtp_fallback_label">SRTP Fallback</string>
+ <string name="account_hello_hash_enable_label">Hello Hash Enabled</string>
+ <string name="account_display_sas_label">Display SAS</string>
+ <string name="account_not_supported_warning_label">Not Supported Warning</string>
+ <string name="account_display_sas_once_label">Display SAS Once</string>
+ <string name="account_listener_port_label">TLS Listener Port</string>
+ <string name="account_tls_enabled_label">TLS Enabled</string>
+ <string name="account_tls_certificate_list_label">TLS Certificate List File</string>
+ <string name="account_tls_certificate_file_label">TLS Certificate File</string>
+ <string name="account_tls_private_key_file_label">TLS Private Key File</string>
+ <string name="account_tls_password_label">TLS Private Key Password</string>
+ <string name="account_tls_method_label">TLS Method</string>
+ <string name="account_tls_ciphers_label">TLS Ciphers</string>
+ <string name="account_tls_server_name_label">TLS Server Name</string>
+ <string name="account_tls_verify_label">TLS Verify Server</string>
+ <string name="account_tls_verify_client_label">TLS Verify Client</string>
+ <string name="account_tls_require_client_certificat_label">TLS Require Client Certificate</string>
+ <string name="account_tls_negotiation_timeout_sec">TLS Negotiation Timeout (sec)</string>
+ <string name="account_tls_negotiation_timeout_msec">TLS Negotiation Timeout (msec)</string>
+ <string name="account_alias_field">Alias</string>
+ <string name="title_account_alias_field">Alias</string>
+ <string name="dialogtitle_account_alias_field">Enter the alias for this account</string>
+ <string name="account_hostname_field">Hostname</string>
+ <string name="title_account_hostname_field">Hostname</string>
+ <string name="dialogtitle_account_hostname_field">Enter hostname</string>
+ <string name="account_username_field">Username</string>
+ <string name="title_account_username_field">Username</string>
+ <string name="dialogtitle_account_username_field">Enter username</string>
+ <string name="account_proxy_field">Proxy</string>
+ <string name="title_account_proxy_field">Proxy</string>
+ <string name="dialogtitle_account_proxy_field">Enter proxy</string>
+ <string name="account_registration_field">Registration Timeout</string>
+ <string name="title_account_registration_field">Registration Timeout</string>
+ <string name="dialogtitle_account_registration_field">Enter registration timeout</string>
+ <string name="account_network_field">Network Interface</string>
+ <string name="title_account_network_field">Network Interface</string>
+ <string name="dialogtitle_account_network_field">Enter registration timeout</string>
+ <string name="account_stun_field">Stun Server</string>
+ <string name="title_account_stun_field">Stun Server</string>
+ <string name="dialogtitle_account_stun_field">Enter stun server</string>
+ <string name="account_security_field">Security</string>
+ <string name="title_account_security_field">Security</string>
+ <string name="dialogtitle_account_security_field">Activate security feature</string>
+ <string name="account_tls_field">TLS</string>
+ <string name="title_account_tls_field">TLS</string>
+ <string name="dialogtitle_account_tls_field">Activate TLS feature</string>
+ <string name="account_srtp_field">SRTP</string>
+ <string name="title_account_srtp_field">SRTP</string>
+ <string name="dialogtitle_account_srtp_field">Activate SRTP feature</string>
+ <string name="title_audio_codec_list">Audio Codec</string>
+ <string name="dialogtitle_audio_codec_list">Audio Codec Available</string>
+ <string name="title_audio_ringtone_field">Ringtone</string>
+ <string name="dialogtitle_audio_ringtone_field">Ringtone</string>
+
+ <!-- Call Actions -->
+ <string name="action_call_attended_transfer">Transfert</string>
+ <string name="action_call_unattended_transfer">Transfert Direct</string>
+ <string name="action_call_general_transfer">Transfert</string>
+ <string name="action_call_conference">Conférence</string>
+ <string name="action_call_hold">Attente</string>
+ <string name="action_call_unhold">Reprendre</string>
+ <string name="action_call_record">Enregistrer</string>
+ <string name="action_call_stop_record">Arrêter l\'enregistrement</string>
+ <string name="action_settings">Paramètres</string>
+ <string name="copyright">Copyright \u00A9 2004–2013 Savoir-Faire Linux Inc.</string>
+ <string name="web_site">Site web</string>
+ <string name="help_gestures"> This view will help users with different interactions during calls. Different actions will be described; Long press, fling, swype etc.</string>
+
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/strings_register_account.xml b/res/values-fr/strings_register_account.xml
new file mode 100644
index 0000000..faf9dd8
--- /dev/null
+++ b/res/values-fr/strings_register_account.xml
@@ -0,0 +1,12 @@
+<resources>
+
+ <!-- Strings related to login -->
+ <string name="prompt_alias">Alias</string>
+ <string name="prompt_hostname">Nom du serveur</string>
+ <string name="prompt_username">Nom d\'utilisateur</string>
+ <string name="prompt_password">Mot de passe</string>
+ <string name="action_create"><b>Enregistrer le compte</b></string>
+ <string name="action_create_short">Enregistrer</string>
+ <string name="error_field_required">Ce champ est requis</string>
+
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c36ceb4..f29589e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -42,10 +42,10 @@
<string name="title_activity_sflphone_home">SFLphone</string>
<string name="create_new_account_dialog_title">No Account Registered</string>
- <string name="create_new_account_dialog">Would you like to create an account now?</string>
+ <string name="create_new_account_dialog">Would you like to register an account now?</string>
<!-- AB menus -->
- <string name="ab_account_creation">New Account</string>
+ <string name="ab_account_creation">New account</string>
<string name="ab_account_edition_1">Delete</string>
<string name="ab_account_edition_2">Edit</string>
@@ -64,11 +64,32 @@
<string name="menu_item_settings_interface">Interface</string>
<!-- Dialing Fragmennt -->
- <string name="error_no_number_dialed">Enter a number</string>
-
+ <string name="error_no_number_dialed">Dial a number</string>
+ <string name="dial_hint">Type phone number</string>
+
+ <!-- History Fragment -->
+ <string name="replay_button">Replay</string>
+ <string name="no_history">No history</string>
+
+ <!-- Home Fragment -->
+ <string name="home_conferences_title">Conferences</string>
+ <string name="home_calls_title">Calls</string>
+
+ <!-- ContactList Fragment -->
+ <string name="no_contact_found">No contact found</string>
+
<!-- Help -->
<string name="menu_item_help_gestures">Gestures</string>
<string name="menu_item_about">About SFLphone</string>
+
+ <!-- TransferDFragment -->
+ <string name="transfer_to_another_call">Transfer to another current call:</string>
+ <string name="transfer_no_other_call">No other calls pending</string>
+ <string name="transfer_type_number">Type number to transfer to:</string>
+
+ <!-- Menu Fragment -->
+ <string name="frag_menu_accounts_title">Accounts</string>
+
<!-- Preferences -->
<string name="preference_section1">Accounts</string>
@@ -163,8 +184,7 @@
<string name="dialogtitle_audio_codec_list">Audio Codec Available</string>
<string name="title_audio_ringtone_field">Ringtone</string>
<string name="dialogtitle_audio_ringtone_field">Ringtone</string>
- <string name="default_account_category">Default Account</string>
- <string name="account_list_category">Account List</string>
+
<!-- Call Actions -->
<string name="action_call_attended_transfer">Attended Transfer</string>
@@ -175,9 +195,11 @@
<string name="action_call_unhold">Unhold</string>
<string name="action_call_record">Record</string>
<string name="action_call_stop_record">Stop Recording</string>
- <string name="title_activity_activity_holder">ActivityHolder</string>
<string name="action_settings">Settings</string>
+
+
<string name="copyright">Copyright \u00A9 2004–2013 Savoir-Faire Linux Inc.</string>
+ <string name="web_site">Website</string>
<string name="help_gestures"> This view will help users with different interactions during calls. Different actions will be described; Long press, fling, swype etc.</string>
diff --git a/res/values/strings_register_account.xml b/res/values/strings_register_account.xml
index 15f7ec5..46291de 100644
--- a/res/values/strings_register_account.xml
+++ b/res/values/strings_register_account.xml
@@ -7,11 +7,6 @@
<string name="prompt_password">Password</string>
<string name="action_create"><b>Register Account</b></string>
<string name="action_create_short">Register</string>
- <string name="action_forgot_password">Recover lost password</string>
- <string name="login_progress_signing_in">Signing in…</string>
- <string name="error_invalid_email">This email address is invalid</string>
- <string name="error_invalid_password">This password is too short</string>
- <string name="error_incorrect_password">This password is incorrect</string>
<string name="error_field_required">This field is required</string>
</resources>