diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f3ce6b4b8bbedffc3500658349789cfa6e75bf45..f4b9dc5bcbdd8cd134e6490c9d95bdee32994723 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -78,6 +78,8 @@ as that of the covered work.
<!-- Home Fragment -->
<string name="home_conferences_title">Conférences</string>
<string name="home_calls_title">Appels</string>
+ <string name="home_transfering">Transfert de %1$s à %1$s</string>
+ <string name="home_transfer_complet">Transfert terminé</string>
<!-- ContactList Fragment -->
<string name="no_contact_found">Aucun contact trouvé</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ba084bd2eb13cdc076c0291b9879ded37bfccd8c..3e3b8e570da8a53c061ca1cf84dbcc2d39be191f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -40,10 +40,9 @@ as that of the covered work.
<string name="title_section1">Call</string>
<string name="title_section2">History</string>
<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 register an account now?</string>
-
+
<!-- AB menus -->
<string name="ab_account_creation">New account</string>
<string name="ab_account_edition_1">Delete</string>
@@ -62,38 +61,40 @@ as that of the covered work.
<string name="menu_item_settings_advanced">Manage Accounts</string>
<string name="menu_item_settings_audio">Audio</string>
<string name="menu_item_settings_interface">Interface</string>
-
+
<!-- Dialing Fragmennt -->
<string name="dial_error_no_number_dialed">Dial a number</string>
<string name="dial_hint">Type phone number</string>
-
+
<!-- History Fragment -->
<string name="hist_replay_button">Replay</string>
<string name="hist_replay_button_stop">Stop</string>
<string name="hist_no_history">No history</string>
- <string name="hist_missed_calls">Missed:%1$d</string>
+ <string name="hist_missed_calls">Missed:%1$d</string>
<string name="hist_in_calls">In:%1$d</string>
<string name="hist_out_calls">Out:%1$d</string>
-
+
<!-- Home Fragment -->
<string name="home_conferences_title">Conferences</string>
<string name="home_calls_title">Calls</string>
-
+ <string name="home_transfering">Transferring %1$s to %1$s</string>
+ <string name="home_transfer_complet">Transfer complete</string>
+ <string name="home_conf_item">%1$s participants</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>
@@ -189,7 +190,6 @@ as that of the covered work.
<string name="title_audio_ringtone_field">Ringtone</string>
<string name="dialogtitle_audio_ringtone_field">Ringtone</string>
-
<!-- Call Actions -->
<string name="action_call_attended_transfer">Attended Transfer</string>
<string name="action_call_unattended_transfer">Unattended transfer</string>
@@ -200,12 +200,8 @@ as that of the covered work.
<string name="action_call_record">Record</string>
<string name="action_call_stop_record">Stop Recording</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>
</resources>
\ No newline at end of file
diff --git a/src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java b/src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java
index 1072562bb96c8cbbfa056bb88ca39d16d3d83105..f7c9ab0cdfcd30be2cf3f78d3cfa798218732c32 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java
@@ -329,8 +329,8 @@ public class HomeFragment extends Fragment {
((TextView) convertView.findViewById(R.id.call_time)).setText(String.format("%d:%02d:%02d", duration / 3600, (duration % 3600) / 60,
(duration % 60)));
} else {
- String tmp = "Conference with " + call.getParticipants().size() + " participants";
- ((TextView) convertView.findViewById(R.id.call_title)).setText(tmp);
+// String tmp = "Conference with " + call.getParticipants().size() + " participants";
+ ((TextView) convertView.findViewById(R.id.call_title)).setText(getString(R.string.home_conf_item, call.getParticipants().size()));
}
// ((TextView) convertView.findViewById(R.id.num_participants)).setText("" + call.getParticipants().size());
((TextView) convertView.findViewById(R.id.call_status)).setText(call.getState());
@@ -426,14 +426,14 @@ public class HomeFragment extends Fragment {
// TODO Auto-generated catch block
e.printStackTrace();
}
- Toast.makeText(getActivity(), "Transfer complete", Toast.LENGTH_LONG).show();
+ Toast.makeText(getActivity(), getString(R.string.home_transfer_complet), Toast.LENGTH_LONG).show();
break;
case 1:
String to = data.getStringExtra("to_number");
transfer = data.getParcelableExtra("transfer");
try {
- Toast.makeText(getActivity(), "Transferring " + transfer.getParticipants().get(0).getContact().getmDisplayName() + " to " + to,
+ Toast.makeText(getActivity(), getString(R.string.home_transfering,transfer.getParticipants().get(0).getContact().getmDisplayName(),to),
Toast.LENGTH_SHORT).show();
mCallbacks.getService().transfer(transfer.getParticipants().get(0).getCallId(), to);
mCallbacks.getService().hangUp(transfer.getParticipants().get(0).getCallId());