diff --git a/Linphone/Localizable.xcstrings b/Linphone/Localizable.xcstrings index 837133a2a..afa0d96d4 100644 --- a/Linphone/Localizable.xcstrings +++ b/Linphone/Localizable.xcstrings @@ -633,9 +633,6 @@ } } } - }, - "Attended transfer" : { - }, "Audio" : { @@ -730,6 +727,70 @@ }, "Call transfer failed!" : { + }, + "call_action_attended_transfer" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Attended transfer" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Transfert" + } + } + } + }, + "call_action_blind_transfer" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Transfer" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Transfert" + } + } + } + }, + "call_action_change_layout" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Layout" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Disposition" + } + } + } + }, + "call_action_go_to_calls_list" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Calls list" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Liste des appels" + } + } + } }, "call_action_hang_up" : { "extractionState" : "manual", @@ -748,6 +809,96 @@ } } }, + "call_action_pause_call" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Pause" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Mettre en pause" + } + } + } + }, + "call_action_record_call" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Record" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Enregistrer" + } + } + } + }, + "call_action_resume_call" : { + "localizations" : { + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Reprendre" + } + } + } + }, + "call_action_show_dialer" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Dialer" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Pavé" + } + } + } + }, + "call_action_show_messages" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Messages" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Messages" + } + } + } + }, + "call_action_start_new_call" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "New call" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nouvel appel" + } + } + } + }, "call_audio_device_type_speaker" : { "localizations" : { "en" : { @@ -968,6 +1119,38 @@ } } }, + "call_state_paused" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Paused" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "En pause" + } + } + } + }, + "call_state_paused_by_remote" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Paused by remote" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Mis en pause par le correspondant" + } + } + } + }, "call_waiting_for_encryption_info" : { "extractionState" : "manual", "localizations" : { @@ -1109,6 +1292,54 @@ }, "Close" : { + }, + "conference_action_screen_sharing" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Screen share" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Partage d’écran" + } + } + } + }, + "conference_action_show_participants" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Participants" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Participants" + } + } + } + }, + "conference_call_empty" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Waiting for other participants…" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "En attente d’autres participants…" + } + } + } }, "conference_failed_to_create_group_call_toast" : { "extractionState" : "manual", @@ -1127,6 +1358,54 @@ } } }, + "conference_participant_joining_text" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Joining…" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "En train de rejoindre…" + } + } + } + }, + "conference_participant_paused_text" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Paused" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "En pause" + } + } + } + }, + "conference_share_link_title" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Share invitation" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Partager le lien" + } + } + } + }, "Configuration failed" : { }, @@ -2466,9 +2745,6 @@ }, "Description" : { - }, - "Dialer" : { - }, "dialog_accept" : { "localizations" : { @@ -2552,9 +2828,6 @@ }, "Display Name" : { - }, - "Disposition" : { - }, "Do you really want to delete all calls history?" : { @@ -2688,12 +2961,6 @@ }, "Edit Contact" : { - }, - "En attente d'autres participants..." : { - - }, - "En pause" : { - }, "Error" : { @@ -2898,10 +3165,10 @@ } } }, - "https://linphone.org/general-terms" : { + "https://linphone.org/en/privacy-policy" : { }, - "https://linphone.org/privacy-policy" : { + "https://linphone.org/general-terms" : { }, "I prefere create an account" : { @@ -2938,9 +3205,6 @@ }, "Invalide URI" : { - }, - "Joining..." : { - }, "list_filter_no_result_found" : { "localizations" : { @@ -3635,9 +3899,6 @@ } } } - }, - "Messages" : { - }, "Mettre en sourdine" : { @@ -3653,9 +3914,6 @@ }, "Network is now reachable again" : { - }, - "New call" : { - }, "new_conversation_create_group" : { "extractionState" : "manual", @@ -3739,22 +3997,26 @@ }, "or" : { - + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "or" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "ou" + } + } + } }, "Oui" : { - }, - "Partage d'écran" : { - - }, - "Partager le lien" : { - }, "Participant actif" : { - }, - "Participants" : { - }, "password" : { "extractionState" : "manual", @@ -3772,15 +4034,9 @@ } } } - }, - "Pause" : { - }, "Paused" : { - }, - "Paused by remote" : { - }, "Personnalize your profil mode" : { @@ -3815,9 +4071,6 @@ }, "Réactiver les notifications" : { - }, - "Record" : { - }, "recordings_title" : { "extractionState" : "manual", @@ -3846,9 +4099,6 @@ } } } - }, - "Resume" : { - }, "Resuming" : { @@ -3946,9 +4196,6 @@ }, "TLS" : { - }, - "Transfer" : { - }, "Transfer call to" : { diff --git a/Linphone/UI/Assistant/Fragments/LoginFragment.swift b/Linphone/UI/Assistant/Fragments/LoginFragment.swift index 222274491..82f2f06c7 100644 --- a/Linphone/UI/Assistant/Fragments/LoginFragment.swift +++ b/Linphone/UI/Assistant/Fragments/LoginFragment.swift @@ -167,7 +167,7 @@ struct LoginFragment: View { .padding(.bottom) HStack { - Text(.init(String(format: ("[%@]](%@)"), String(localized: "assistant_forgotten_password"), "https://subscribe.linphone.org/"))) + Text(.init(String(format: ("[%@](%@)"), String(localized: "assistant_forgotten_password"), "https://subscribe.linphone.org/"))) .underline() .tint(Color.grayMain2c600) .default_text_style_600(styleSize: 15) @@ -294,7 +294,7 @@ struct LoginFragment: View { if self.isShowPopup { let generalTerms = String(format: "[%@](%@)", String(localized: "assistant_dialog_general_terms_label"), String(localized: "https://linphone.org/general-terms")) - let privacyPolicy = String(format: "[%@](%@)", String(localized: "assistant_dialog_privacy_policy_label"), String(localized: "https://linphone.org/privacy-policy")) + let privacyPolicy = String(format: "[%@](%@)", String(localized: "assistant_dialog_privacy_policy_label"), String(localized: "https://linphone.org/en/privacy-policy")) let splitMsg = String(localized: "assistant_dialog_general_terms_and_privacy_policy_message").components(separatedBy: "%@") if splitMsg.count == 3 { // We expect form of STRING %A STRING %@ STRING let contentPopup1 = Text(.init(splitMsg[0])) diff --git a/Linphone/UI/Call/CallView.swift b/Linphone/UI/Call/CallView.swift index caf4be1fe..365b4b12e 100644 --- a/Linphone/UI/Call/CallView.swift +++ b/Linphone/UI/Call/CallView.swift @@ -300,10 +300,10 @@ struct CallView: View { } if callViewModel.isPaused { - Text("Paused") + Text("call_state_paused") .default_text_style_white_800(styleSize: 16) } else if telecomManager.isPausedByRemote { - Text("Paused by remote") + Text("call_state_paused_by_remote") .default_text_style_white_800(styleSize: 16) } } @@ -645,7 +645,7 @@ struct CallView: View { VStack { Spacer() - Text("En attente d'autres participants...") + Text("conference_call_empty") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_300(styleSize: 25) @@ -670,7 +670,7 @@ struct CallView: View { .foregroundStyle(Color.grayMain2c400) .frame(width: 30, height: 30) - Text("Partager le lien") + Text("conference_share_link_title") .foregroundStyle(Color.grayMain2c400) .default_text_style(styleSize: 25) .frame(height: 40) @@ -829,7 +829,7 @@ struct CallView: View { .foregroundStyle(.white) .frame(width: 40, height: 40) - Text("En pause") + Text("conference_participant_paused_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1015,7 +1015,7 @@ struct CallView: View { .frame(width: 40, height: 40) .padding(.bottom, 5) - Text("Joining...") + Text("conference_participant_joining_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1034,7 +1034,7 @@ struct CallView: View { .foregroundStyle(.white) .frame(width: 40, height: 40) - Text("En pause") + Text("conference_participant_paused_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1182,7 +1182,7 @@ struct CallView: View { .frame(width: 40, height: 40) .padding(.bottom, 5) - Text("Joining...") + Text("conference_participant_joining_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1201,7 +1201,7 @@ struct CallView: View { .foregroundStyle(.white) .frame(width: 40, height: 40) - Text("En pause") + Text("conference_participant_paused_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1325,7 +1325,7 @@ struct CallView: View { .frame(width: maxValue/4, height: maxValue/4) .padding(.bottom, 5) - Text("Joining...") + Text("conference_participant_joining_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1344,7 +1344,7 @@ struct CallView: View { .foregroundStyle(.white) .frame(width: maxValue/4, height: maxValue/4) - Text("En pause") + Text("conference_participant_paused_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1441,7 +1441,7 @@ struct CallView: View { .frame(width: maxValue/4, height: maxValue/4) .padding(.bottom, 5) - Text("Joining...") + Text("conference_participant_joining_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1460,7 +1460,7 @@ struct CallView: View { .foregroundStyle(.white) .frame(width: maxValue/4, height: maxValue/4) - Text("En pause") + Text("conference_participant_paused_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1561,7 +1561,7 @@ struct CallView: View { .frame(width: maxValue/4, height: maxValue/4) .padding(.bottom, 5) - Text("Joining...") + Text("conference_participant_joining_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1580,7 +1580,7 @@ struct CallView: View { .foregroundStyle(.white) .frame(width: maxValue/4, height: maxValue/4) - Text("En pause") + Text("conference_participant_paused_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1677,7 +1677,7 @@ struct CallView: View { .frame(width: maxValue/4, height: maxValue/4) .padding(.bottom, 5) - Text("Joining...") + Text("conference_participant_joining_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -1696,7 +1696,7 @@ struct CallView: View { .foregroundStyle(.white) .frame(width: maxValue/4, height: maxValue/4) - Text("En pause") + Text("conference_participant_paused_text") .frame(maxWidth: .infinity, alignment: .center) .foregroundStyle(Color.white) .default_text_style_500(styleSize: 14) @@ -2035,7 +2035,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text(callViewModel.callsCounter < 2 ? "Transfer" : "Attended transfer") + Text(callViewModel.callsCounter < 2 ? "call_action_blind_transfer" : "call_action_attended_transfer") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2068,7 +2068,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text("New call") + Text("call_action_start_new_call") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2091,7 +2091,7 @@ struct CallView: View { .cornerRadius(40) .disabled(true) - Text("Partage d'écran") + Text("conference_action_screen_sharing") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2116,7 +2116,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text("Participants") + Text("conference_action_show_participants") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2171,7 +2171,7 @@ struct CallView: View { } } - Text("Call list") + Text("call_action_go_to_calls_list") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2201,7 +2201,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text("Dialer") + Text("call_action_show_dialer") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2224,7 +2224,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text("Disposition") + Text("call_action_change_layout") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2266,7 +2266,7 @@ struct CallView: View { .cornerRadius(40) .disabled(!callViewModel.isOneOneCall) - Text("Messages") + Text("call_action_show_messages") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2290,7 +2290,7 @@ struct CallView: View { .cornerRadius(40) .disabled(telecomManager.isPausedByRemote) - Text("Pause") + Text("call_action_pause_call") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2315,7 +2315,7 @@ struct CallView: View { .cornerRadius(40) .disabled(callViewModel.isPaused || telecomManager.isPausedByRemote) - Text("Record") + Text("call_action_record_call") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2338,7 +2338,7 @@ struct CallView: View { .cornerRadius(40) .disabled(true) - Text("Record") + Text("call_action_record_call") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2361,7 +2361,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text("Disposition") + Text("call_action_change_layout") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2404,7 +2404,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text(callViewModel.callsCounter < 2 ? "Transfer" : "Attended transfer") + Text(callViewModel.callsCounter < 2 ? "call_action_blind_transfer" : "call_action_attended_transfer") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2437,7 +2437,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text("New call") + Text("call_action_start_new_call") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2461,7 +2461,7 @@ struct CallView: View { .cornerRadius(40) .disabled(true) - Text("Partage d'écran") + Text("conference_action_screen_sharing") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2487,7 +2487,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text("Participants") + Text("conference_action_show_participants") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2543,7 +2543,7 @@ struct CallView: View { } } - Text("Call list") + Text("call_action_go_to_calls_list") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2573,7 +2573,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text("Dialer") + Text("call_action_show_dialer") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2596,7 +2596,7 @@ struct CallView: View { .background(Color.gray500) .cornerRadius(40) - Text("Disposition") + Text("call_action_change_layout") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2635,7 +2635,7 @@ struct CallView: View { .cornerRadius(40) .disabled(!callViewModel.isOneOneCall) - Text("Messages") + Text("call_action_show_messages") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2659,7 +2659,7 @@ struct CallView: View { .cornerRadius(40) .disabled(telecomManager.isPausedByRemote) - Text("Pause") + Text("call_action_pause_call") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2684,7 +2684,7 @@ struct CallView: View { .cornerRadius(40) .disabled(callViewModel.isPaused || telecomManager.isPausedByRemote) - Text("Record") + Text("call_action_record_call") .foregroundStyle(.white) .default_text_style(styleSize: 15) } @@ -2707,7 +2707,7 @@ struct CallView: View { .cornerRadius(40) .disabled(true) - Text("Record") + Text("call_action_record_call") .foregroundStyle(.white) .default_text_style(styleSize: 15) } diff --git a/Linphone/UI/Call/Fragments/CallsListFragment.swift b/Linphone/UI/Call/Fragments/CallsListFragment.swift index dfc84b328..693f3f864 100644 --- a/Linphone/UI/Call/Fragments/CallsListFragment.swift +++ b/Linphone/UI/Call/Fragments/CallsListFragment.swift @@ -182,7 +182,7 @@ struct CallsListFragment: View { Text((callViewModel.selectedCall!.state == .PausedByRemote || callViewModel.selectedCall!.state == .Pausing - || callViewModel.selectedCall!.state == .Paused) ? "Resume" : "Pause") + || callViewModel.selectedCall!.state == .Paused) ? "call_action_resume_call" : "call_action_pause_call") .default_text_style(styleSize: 15) Spacer()