Skip to content
Snippets Groups Projects
Commit 64d63234 authored by Alexandre Lision's avatar Alexandre Lision
Browse files

* #30787: completing french support

parent 7a0401d6
No related branches found
No related tags found
No related merge requests found
...@@ -78,6 +78,8 @@ as that of the covered work. ...@@ -78,6 +78,8 @@ as that of the covered work.
<!-- Home Fragment --> <!-- Home Fragment -->
<string name="home_conferences_title">Conférences</string> <string name="home_conferences_title">Conférences</string>
<string name="home_calls_title">Appels</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 --> <!-- ContactList Fragment -->
<string name="no_contact_found">Aucun contact trouvé</string> <string name="no_contact_found">Aucun contact trouvé</string>
......
...@@ -40,7 +40,6 @@ as that of the covered work. ...@@ -40,7 +40,6 @@ as that of the covered work.
<string name="title_section1">Call</string> <string name="title_section1">Call</string>
<string name="title_section2">History</string> <string name="title_section2">History</string>
<string name="title_activity_sflphone_home">SFLphone</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_title">No Account Registered</string>
<string name="create_new_account_dialog">Would you like to register an account now?</string> <string name="create_new_account_dialog">Would you like to register an account now?</string>
...@@ -78,6 +77,9 @@ as that of the covered work. ...@@ -78,6 +77,9 @@ as that of the covered work.
<!-- Home Fragment --> <!-- Home Fragment -->
<string name="home_conferences_title">Conferences</string> <string name="home_conferences_title">Conferences</string>
<string name="home_calls_title">Calls</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 --> <!-- ContactList Fragment -->
<string name="no_contact_found">No contact found</string> <string name="no_contact_found">No contact found</string>
...@@ -94,7 +96,6 @@ as that of the covered work. ...@@ -94,7 +96,6 @@ as that of the covered work.
<!-- Menu Fragment --> <!-- Menu Fragment -->
<string name="frag_menu_accounts_title">Accounts</string> <string name="frag_menu_accounts_title">Accounts</string>
<!-- Preferences --> <!-- Preferences -->
<string name="preference_section1">Accounts</string> <string name="preference_section1">Accounts</string>
<string name="preference_section2">Audio</string> <string name="preference_section2">Audio</string>
...@@ -189,7 +190,6 @@ as that of the covered work. ...@@ -189,7 +190,6 @@ as that of the covered work.
<string name="title_audio_ringtone_field">Ringtone</string> <string name="title_audio_ringtone_field">Ringtone</string>
<string name="dialogtitle_audio_ringtone_field">Ringtone</string> <string name="dialogtitle_audio_ringtone_field">Ringtone</string>
<!-- Call Actions --> <!-- Call Actions -->
<string name="action_call_attended_transfer">Attended Transfer</string> <string name="action_call_attended_transfer">Attended Transfer</string>
<string name="action_call_unattended_transfer">Unattended transfer</string> <string name="action_call_unattended_transfer">Unattended transfer</string>
...@@ -200,12 +200,8 @@ as that of the covered work. ...@@ -200,12 +200,8 @@ as that of the covered work.
<string name="action_call_record">Record</string> <string name="action_call_record">Record</string>
<string name="action_call_stop_record">Stop Recording</string> <string name="action_call_stop_record">Stop Recording</string>
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<string name="copyright">Copyright \u00A9 2004&#8211;2013 Savoir-Faire Linux Inc.</string> <string name="copyright">Copyright \u00A9 2004&#8211;2013 Savoir-Faire Linux Inc.</string>
<string name="web_site">Website</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> <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> </resources>
\ No newline at end of file
...@@ -329,8 +329,8 @@ public class HomeFragment extends Fragment { ...@@ -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, ((TextView) convertView.findViewById(R.id.call_time)).setText(String.format("%d:%02d:%02d", duration / 3600, (duration % 3600) / 60,
(duration % 60))); (duration % 60)));
} else { } else {
String tmp = "Conference with " + call.getParticipants().size() + " participants"; // String tmp = "Conference with " + call.getParticipants().size() + " participants";
((TextView) convertView.findViewById(R.id.call_title)).setText(tmp); ((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.num_participants)).setText("" + call.getParticipants().size());
((TextView) convertView.findViewById(R.id.call_status)).setText(call.getState()); ((TextView) convertView.findViewById(R.id.call_status)).setText(call.getState());
...@@ -426,14 +426,14 @@ public class HomeFragment extends Fragment { ...@@ -426,14 +426,14 @@ public class HomeFragment extends Fragment {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); 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; break;
case 1: case 1:
String to = data.getStringExtra("to_number"); String to = data.getStringExtra("to_number");
transfer = data.getParcelableExtra("transfer"); transfer = data.getParcelableExtra("transfer");
try { 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(); Toast.LENGTH_SHORT).show();
mCallbacks.getService().transfer(transfer.getParticipants().get(0).getCallId(), to); mCallbacks.getService().transfer(transfer.getParticipants().get(0).getCallId(), to);
mCallbacks.getService().hangUp(transfer.getParticipants().get(0).getCallId()); mCallbacks.getService().hangUp(transfer.getParticipants().get(0).getCallId());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment