mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-17 20:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix/fetch-config' into 'release/6.2'

Browse source 
Fix/fetch configimprove ui/ux when FAM send 422 on register with phone number

See merge request BC/public/linphone-desktop!1811
This commit is contained in:
Gaëlle Braud 2026-04-15 13:34:50 +00:00
commit 655baa33c2
13 changed files with 320 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/core/chat/message/EventLogProxy.cpp
View file

@ -62,9 +62,9 @@ void EventLogProxy::setSourceModel(QAbstractItemModel *model) {
lInfo() << "Found index by id, request highlight at index" << proxyIndex; lInfo() << "Found index by id, request highlight at index" << proxyIndex;
emit foundMessagById(proxyIndex); emit foundMessagById(proxyIndex);
} else { } else {
Utils::showInformationPopup("info_popup_error_title", Utils::showInformationPopup(tr("info_popup_error_title"),
//: Original message not found. It may have been deleted //: Original message not found. It may have been deleted
"info_popup_reply_message_not_found_error"); tr("info_popup_reply_message_not_found_error"));
} }
}); });
connect(newEventLogList, &EventLogList::eventInsertedByUser, this, [this, newEventLogList](int i) { connect(newEventLogList, &EventLogList::eventInsertedByUser, this, [this, newEventLogList](int i) {

8
Linphone/core/register/RegisterPage.cpp
View file

@ -86,6 +86,14 @@ void RegisterPage::registerNewAccount(const QString &username,
accountManager = nullptr; accountManager = nullptr;
} }
}); });
connect(accountManager, &AccountManager::phoneNumberValidationNotAvailable, this,
[this, accountManager]() mutable {
App::postCoreAsync([this]() { emit phoneNumberValidationNotAvailable(); });
if (accountManager) {
accountManager->deleteLater();
accountManager = nullptr;
}
});
connect(accountManager, &AccountManager::tokenConversionSucceed, this, connect(accountManager, &AccountManager::tokenConversionSucceed, this,
[this, accountManager, address](QString convertedToken) { [this, accountManager, address](QString convertedToken) {
App::postCoreAsync([this, convertedToken, address]() { App::postCoreAsync([this, convertedToken, address]() {

1
Linphone/core/register/RegisterPage.hpp
View file

@ -53,6 +53,7 @@ signals:
const QString &sipIdentityAddress); const QString &sipIdentityAddress);
void registerNewAccountFailed(const QString &error); void registerNewAccountFailed(const QString &error);
void errorInField(const QString &field, const QString &error); void errorInField(const QString &field, const QString &error);
void phoneNumberValidationNotAvailable();
void tokenConversionSucceed(); void tokenConversionSucceed();
void linkingNewAccountWithCodeSucceed(); void linkingNewAccountWithCodeSucceed();
void linkingNewAccountWithCodeFailed(const QString &error); void linkingNewAccountWithCodeFailed(const QString &error);

125
Linphone/data/languages/de.ts
View file

@ -2511,6 +2511,7 @@ Error</extracomment>
<message> <message>
<location filename="../../view/Control/Display/Chat/ChatMessageInvitationBubble.qml" line="182"/> <location filename="../../view/Control/Display/Chat/ChatMessageInvitationBubble.qml" line="182"/>
<source></source> <source></source>
<extracomment>from %1 to %2 (UTC%3)</extracomment>
<translation>von %1 zu %2 (UTC%3)</translation> <translation>von %1 zu %2 (UTC%3)</translation>
</message> </message>
<message> <message>
@ -4095,6 +4096,20 @@ Ablauf: %1</translation>
<translation>%1 ist nun ein Administrator</translation> <translation>%1 ist nun ein Administrator</translation>
</message> </message>
</context> </context>
<context>
<name>EventLogProxy</name>
<message>
<location filename="../../core/chat/message/EventLogProxy.cpp" line="65"/>
<source>info_popup_error_title</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
<location filename="../../core/chat/message/EventLogProxy.cpp" line="67"/>
<source>info_popup_reply_message_not_found_error</source>
<extracomment>Original message not found. It may have been deleted</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>FriendCore</name> <name>FriendCore</name>
<message> <message>
@ -6021,135 +6036,153 @@ Ablauf: %1</translation>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="46"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="21"/>
<source>phone_number_validation_not_available_title</source>
<extracomment>Phone number validation not available</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="23"/>
<source>phone_number_validation_not_available_text</source>
<extracomment>Phone number validation is not available, please use email account creation process</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="25"/>
<source>register_with_email_button</source>
<extracomment>Register with an email</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="64"/>
<source>return_accessible_name</source> <source>return_accessible_name</source>
<extracomment>Return</extracomment> <extracomment>Return</extracomment>
<translation>Zurückkehren</translation> <translation>Zurückkehren</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="58"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="76"/>
<source>assistant_account_register</source> <source>assistant_account_register</source>
<extracomment>&quot;Inscription</extracomment> <extracomment>&quot;Inscription</extracomment>
<translation>Registrieren</translation> <translation>Registrieren</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="77"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="95"/>
<source>assistant_already_have_an_account</source> <source>assistant_already_have_an_account</source>
<translation>Haben Sie bereits ein Konto?</translation> <translation>Haben Sie bereits ein Konto?</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="85"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="103"/>
<source>assistant_account_login</source> <source>assistant_account_login</source>
<translation>Anmelden</translation> <translation>Anmelden</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="107"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="125"/>
<source>assistant_account_register_with_phone_number</source> <source>assistant_account_register_with_phone_number</source>
<translation>Mit Telefonnummer registrieren</translation> <translation>Mit Telefonnummer registrieren</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="109"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="127"/>
<source>assistant_account_register_with_email</source> <source>assistant_account_register_with_email</source>
<translation>Mit E-Mail registrieren</translation> <translation>Mit E-Mail registrieren</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="138"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="156"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="147"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="165"/>
<source>username</source> <source>username</source>
<translation>Benutzername</translation> <translation>Benutzername</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="147"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="165"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="182"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="200"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="196"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="214"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="220"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="238"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="236"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="254"/>
<source>mandatory_field_accessible_name</source> <source>mandatory_field_accessible_name</source>
<extracomment>&quot;%1 mandatory&quot;</extracomment> <extracomment>&quot;%1 mandatory&quot;</extracomment>
<translation>%1 ist verpflichtend</translation> <translation>%1 ist verpflichtend</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="158"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="176"/>
<source>domain</source> <source>domain</source>
<translation>Domäne</translation> <translation>Domäne</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="176"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="194"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="179"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="197"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="182"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="200"/>
<source>phone_number</source> <source>phone_number</source>
<extracomment>&quot;Numéro de téléphone&quot;</extracomment> <extracomment>&quot;Numéro de téléphone&quot;</extracomment>
<translation>Telefonnummer</translation> <translation>Telefonnummer</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="188"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="206"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="196"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="214"/>
<source>email</source> <source>email</source>
<translation>Email</translation> <translation>Email</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="210"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="228"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="220"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="238"/>
<source>password</source> <source>password</source>
<translation>Passwort</translation> <translation>Passwort</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="227"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="245"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="236"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="254"/>
<source>assistant_account_register_password_confirmation</source> <source>assistant_account_register_password_confirmation</source>
<extracomment>&quot;Confirmation mot de passe&quot;</extracomment> <extracomment>&quot;Confirmation mot de passe&quot;</extracomment>
<translation>Passwort bestätigen</translation> <translation>Passwort bestätigen</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="272"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="290"/>
<source>assistant_dialog_cgu_and_privacy_policy_message</source> <source>assistant_dialog_cgu_and_privacy_policy_message</source>
<extracomment>&quot;J&apos;accepte les %1 et la %2&quot;</extracomment> <extracomment>&quot;J&apos;accepte les %1 et la %2&quot;</extracomment>
<translation>Ich akzeptiere %1 und %2</translation> <translation>Ich akzeptiere %1 und %2</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="274"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="292"/>
<source>assistant_dialog_general_terms_label</source> <source>assistant_dialog_general_terms_label</source>
<extracomment>&quot;conditions d&apos;utilisation&quot;</extracomment> <extracomment>&quot;conditions d&apos;utilisation&quot;</extracomment>
<translation>Allgemeine Geschäftsbedingungen</translation> <translation>Allgemeine Geschäftsbedingungen</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="276"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="294"/>
<source>assistant_dialog_privacy_policy_label</source> <source>assistant_dialog_privacy_policy_label</source>
<extracomment>&quot;politique de confidentialité&quot;</extracomment> <extracomment>&quot;politique de confidentialité&quot;</extracomment>
<translation>Datenschutzrichtlinie</translation> <translation>Datenschutzrichtlinie</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="311"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="329"/>
<source>assistant_account_create</source> <source>assistant_account_create</source>
<extracomment>&quot;Créer&quot;</extracomment> <extracomment>&quot;Créer&quot;</extracomment>
<translation>Erstellen</translation> <translation>Erstellen</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="316"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="334"/>
<source>assistant_account_create_missing_username_error</source> <source>assistant_account_create_missing_username_error</source>
<extracomment>&quot;Veuillez entrer un nom d&apos;utilisateur&quot;</extracomment> <extracomment>&quot;Veuillez entrer un nom d&apos;utilisateur&quot;</extracomment>
<translation>Bitte Benutzernamen eingeben</translation> <translation>Bitte Benutzernamen eingeben</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="320"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="338"/>
<source>assistant_account_create_missing_password_error</source> <source>assistant_account_create_missing_password_error</source>
<extracomment>&quot;Veuillez entrer un mot de passe&quot;</extracomment> <extracomment>&quot;Veuillez entrer un mot de passe&quot;</extracomment>
<translation>Bitte Passwort eingeben</translation> <translation>Bitte Passwort eingeben</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="324"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="342"/>
<source>assistant_account_create_confirm_password_error</source> <source>assistant_account_create_confirm_password_error</source>
<extracomment>&quot;Les mots de passe sont différents&quot;</extracomment> <extracomment>&quot;Les mots de passe sont différents&quot;</extracomment>
<translation>Die Passwörter stimmen nicht überein</translation> <translation>Die Passwörter stimmen nicht überein</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="328"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="346"/>
<source>assistant_account_create_missing_number_error</source> <source>assistant_account_create_missing_number_error</source>
<extracomment>&quot;Veuillez entrer un numéro de téléphone&quot;</extracomment> <extracomment>&quot;Veuillez entrer un numéro de téléphone&quot;</extracomment>
<translation>Bitte Telefonnummer eingeben</translation> <translation>Bitte Telefonnummer eingeben</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="332"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="350"/>
<source>assistant_account_create_missing_email_error</source> <source>assistant_account_create_missing_email_error</source>
<extracomment>&quot;Veuillez entrer un email&quot;</extracomment> <extracomment>&quot;Veuillez entrer un email&quot;</extracomment>
<translation>Bitte E-Mail eingeben</translation> <translation>Bitte E-Mail eingeben</translation>
@ -6562,6 +6595,28 @@ Pour les activer dans un projet commercial, merci de nous contacter.</source>
<translation>Speichern</translation> <translation>Speichern</translation>
</message> </message>
</context> </context>
<context>
<name>SoundPlayerModel</name>
<message>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="65"/>
<source>sound_player_pause_error</source>
<extracomment>Unable to pause</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="87"/>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="107"/>
<source>sound_player_open_error</source>
<extracomment>Unable to open: `%1`</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="92"/>
<source>sound_player_play_error</source>
<extracomment>Unable to play %1</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>Sticker</name> <name>Sticker</name>
<message> <message>
@ -6663,6 +6718,12 @@ Pour les activer dans un projet commercial, merci de nous contacter.</source>
<extracomment>&quot;Unknown device&quot;</extracomment> <extracomment>&quot;Unknown device&quot;</extracomment>
<translation>Unbekannter Gerätename</translation> <translation>Unbekannter Gerätename</translation>
</message> </message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="660"/>
<source>Dummy subject</source>
<extracomment>Dummy subject</extracomment>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Utils</name> <name>Utils</name>

125
Linphone/data/languages/en.ts
View file

@ -2470,6 +2470,7 @@ Error</extracomment>
<message> <message>
<location filename="../../view/Control/Display/Chat/ChatMessageInvitationBubble.qml" line="182"/> <location filename="../../view/Control/Display/Chat/ChatMessageInvitationBubble.qml" line="182"/>
<source></source> <source></source>
<extracomment>from %1 to %2 (UTC%3)</extracomment>
<translation>from %1 to %2 (UTC%3)</translation> <translation>from %1 to %2 (UTC%3)</translation>
</message> </message>
<message> <message>
@ -4004,6 +4005,20 @@ Expiration : %1</translation>
Expiration : %1</translation> Expiration : %1</translation>
</message> </message>
</context> </context>
<context>
<name>EventLogProxy</name>
<message>
<location filename="../../core/chat/message/EventLogProxy.cpp" line="65"/>
<source>info_popup_error_title</source>
<translation>Error</translation>
</message>
<message>
<location filename="../../core/chat/message/EventLogProxy.cpp" line="67"/>
<source>info_popup_reply_message_not_found_error</source>
<extracomment>Original message not found. It may have been deleted</extracomment>
<translation>Original message not found. It may have been deleted</translation>
</message>
</context>
<context> <context>
<name>FriendCore</name> <name>FriendCore</name>
<message> <message>
@ -5904,135 +5919,153 @@ Expiration : %1</translation>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="46"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="21"/>
<source>phone_number_validation_not_available_title</source>
<extracomment>Phone number validation not available</extracomment>
<translation>Phone number validation not available</translation>
</message>
<message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="23"/>
<source>phone_number_validation_not_available_text</source>
<extracomment>Phone number validation is not available, please use email account creation process</extracomment>
<translation>Phone number validation is not available, please use email account creation process</translation>
</message>
<message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="25"/>
<source>register_with_email_button</source>
<extracomment>Register with an email</extracomment>
<translation>Register with an email</translation>
</message>
<message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="64"/>
<source>return_accessible_name</source> <source>return_accessible_name</source>
<extracomment>Return</extracomment> <extracomment>Return</extracomment>
<translation>Return</translation> <translation>Return</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="58"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="76"/>
<source>assistant_account_register</source> <source>assistant_account_register</source>
<extracomment>&quot;Inscription</extracomment> <extracomment>&quot;Inscription</extracomment>
<translation>Register</translation> <translation>Register</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="77"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="95"/>
<source>assistant_already_have_an_account</source> <source>assistant_already_have_an_account</source>
<translation>Already have an account ?</translation> <translation>Already have an account ?</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="85"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="103"/>
<source>assistant_account_login</source> <source>assistant_account_login</source>
<translation>Connection</translation> <translation>Connection</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="107"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="125"/>
<source>assistant_account_register_with_phone_number</source> <source>assistant_account_register_with_phone_number</source>
<translation>Register with a phone number</translation> <translation>Register with a phone number</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="109"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="127"/>
<source>assistant_account_register_with_email</source> <source>assistant_account_register_with_email</source>
<translation>Register with email</translation> <translation>Register with email</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="138"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="156"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="147"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="165"/>
<source>username</source> <source>username</source>
<translation>Username</translation> <translation>Username</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="147"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="165"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="182"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="200"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="196"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="214"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="220"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="238"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="236"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="254"/>
<source>mandatory_field_accessible_name</source> <source>mandatory_field_accessible_name</source>
<extracomment>&quot;%1 mandatory&quot;</extracomment> <extracomment>&quot;%1 mandatory&quot;</extracomment>
<translation>%1 mandatory</translation> <translation>%1 mandatory</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="158"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="176"/>
<source>domain</source> <source>domain</source>
<translation>Domain</translation> <translation>Domain</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="176"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="194"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="179"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="197"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="182"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="200"/>
<source>phone_number</source> <source>phone_number</source>
<extracomment>&quot;Numéro de téléphone&quot;</extracomment> <extracomment>&quot;Numéro de téléphone&quot;</extracomment>
<translation>Phone number</translation> <translation>Phone number</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="188"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="206"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="196"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="214"/>
<source>email</source> <source>email</source>
<translation>Email</translation> <translation>Email</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="210"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="228"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="220"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="238"/>
<source>password</source> <source>password</source>
<translation>Password</translation> <translation>Password</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="227"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="245"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="236"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="254"/>
<source>assistant_account_register_password_confirmation</source> <source>assistant_account_register_password_confirmation</source>
<extracomment>&quot;Confirmation mot de passe&quot;</extracomment> <extracomment>&quot;Confirmation mot de passe&quot;</extracomment>
<translation>Password confirmation</translation> <translation>Password confirmation</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="272"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="290"/>
<source>assistant_dialog_cgu_and_privacy_policy_message</source> <source>assistant_dialog_cgu_and_privacy_policy_message</source>
<extracomment>&quot;J&apos;accepte les %1 et la %2&quot;</extracomment> <extracomment>&quot;J&apos;accepte les %1 et la %2&quot;</extracomment>
<translation>I accept the %1 and the %2</translation> <translation>I accept the %1 and the %2</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="274"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="292"/>
<source>assistant_dialog_general_terms_label</source> <source>assistant_dialog_general_terms_label</source>
<extracomment>&quot;conditions d&apos;utilisation&quot;</extracomment> <extracomment>&quot;conditions d&apos;utilisation&quot;</extracomment>
<translation>terms of use</translation> <translation>terms of use</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="276"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="294"/>
<source>assistant_dialog_privacy_policy_label</source> <source>assistant_dialog_privacy_policy_label</source>
<extracomment>&quot;politique de confidentialité&quot;</extracomment> <extracomment>&quot;politique de confidentialité&quot;</extracomment>
<translation>privacy policy</translation> <translation>privacy policy</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="311"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="329"/>
<source>assistant_account_create</source> <source>assistant_account_create</source>
<extracomment>&quot;Créer&quot;</extracomment> <extracomment>&quot;Créer&quot;</extracomment>
<translation>Create</translation> <translation>Create</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="316"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="334"/>
<source>assistant_account_create_missing_username_error</source> <source>assistant_account_create_missing_username_error</source>
<extracomment>&quot;Veuillez entrer un nom d&apos;utilisateur&quot;</extracomment> <extracomment>&quot;Veuillez entrer un nom d&apos;utilisateur&quot;</extracomment>
<translation>Please enter a username</translation> <translation>Please enter a username</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="320"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="338"/>
<source>assistant_account_create_missing_password_error</source> <source>assistant_account_create_missing_password_error</source>
<extracomment>&quot;Veuillez entrer un mot de passe&quot;</extracomment> <extracomment>&quot;Veuillez entrer un mot de passe&quot;</extracomment>
<translation>Please enter a password</translation> <translation>Please enter a password</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="324"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="342"/>
<source>assistant_account_create_confirm_password_error</source> <source>assistant_account_create_confirm_password_error</source>
<extracomment>&quot;Les mots de passe sont différents&quot;</extracomment> <extracomment>&quot;Les mots de passe sont différents&quot;</extracomment>
<translation>Passwords do not match</translation> <translation>Passwords do not match</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="328"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="346"/>
<source>assistant_account_create_missing_number_error</source> <source>assistant_account_create_missing_number_error</source>
<extracomment>&quot;Veuillez entrer un numéro de téléphone&quot;</extracomment> <extracomment>&quot;Veuillez entrer un numéro de téléphone&quot;</extracomment>
<translation>Please enter a phone number</translation> <translation>Please enter a phone number</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="332"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="350"/>
<source>assistant_account_create_missing_email_error</source> <source>assistant_account_create_missing_email_error</source>
<extracomment>&quot;Veuillez entrer un email&quot;</extracomment> <extracomment>&quot;Veuillez entrer un email&quot;</extracomment>
<translation>Please enter an email</translation> <translation>Please enter an email</translation>
@ -6433,6 +6466,28 @@ To enable them in a commercial project, please contact us.</translation>
<translation>Save</translation> <translation>Save</translation>
</message> </message>
</context> </context>
<context>
<name>SoundPlayerModel</name>
<message>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="65"/>
<source>sound_player_pause_error</source>
<extracomment>Unable to pause</extracomment>
<translation>Unable to pause</translation>
</message>
<message>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="87"/>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="107"/>
<source>sound_player_open_error</source>
<extracomment>Unable to open: `%1`</extracomment>
<translation>Unable to open: `%1`</translation>
</message>
<message>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="92"/>
<source>sound_player_play_error</source>
<extracomment>Unable to play %1</extracomment>
<translation>Unable to play %1</translation>
</message>
</context>
<context> <context>
<name>Sticker</name> <name>Sticker</name>
<message> <message>
@ -6504,6 +6559,12 @@ To enable them in a commercial project, please contact us.</translation>
<extracomment>&quot;Unknown device&quot;</extracomment> <extracomment>&quot;Unknown device&quot;</extracomment>
<translation>Unknown device name</translation> <translation>Unknown device name</translation>
</message> </message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="660"/>
<source>Dummy subject</source>
<extracomment>Dummy subject</extracomment>
<translation>Dummy subject</translation>
</message>
<message> <message>
<location filename="../../model/tool/ToolModel.cpp" line="548"/> <location filename="../../model/tool/ToolModel.cpp" line="548"/>
<source>conference_invitation</source> <source>conference_invitation</source>

125
Linphone/data/languages/fr.ts
View file

@ -2470,6 +2470,7 @@ Error</extracomment>
<message> <message>
<location filename="../../view/Control/Display/Chat/ChatMessageInvitationBubble.qml" line="182"/> <location filename="../../view/Control/Display/Chat/ChatMessageInvitationBubble.qml" line="182"/>
<source></source> <source></source>
<extracomment>from %1 to %2 (UTC%3)</extracomment>
<translation>de %1 à %2 (UTC%3)</translation> <translation>de %1 à %2 (UTC%3)</translation>
</message> </message>
<message> <message>
@ -4004,6 +4005,20 @@ Expiration : %1</translation>
<translation>%1 est maintenant admin</translation> <translation>%1 est maintenant admin</translation>
</message> </message>
</context> </context>
<context>
<name>EventLogProxy</name>
<message>
<location filename="../../core/chat/message/EventLogProxy.cpp" line="65"/>
<source>info_popup_error_title</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../../core/chat/message/EventLogProxy.cpp" line="67"/>
<source>info_popup_reply_message_not_found_error</source>
<extracomment>Original message not found. It may have been deleted</extracomment>
<translation>Le message original n&apos;a pas été trouvé. Il a pu être supprimé</translation>
</message>
</context>
<context> <context>
<name>FriendCore</name> <name>FriendCore</name>
<message> <message>
@ -5904,135 +5919,153 @@ Expiration : %1</translation>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="46"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="21"/>
<source>phone_number_validation_not_available_title</source>
<extracomment>Phone number validation not available</extracomment>
<translation>Validation par téléphone indisponible</translation>
</message>
<message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="23"/>
<source>phone_number_validation_not_available_text</source>
<extracomment>Phone number validation is not available, please use email account creation process</extracomment>
<translation>La validation par téléphone est indisponible, veuillez utiliser le processus de création de compte avec email</translation>
</message>
<message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="25"/>
<source>register_with_email_button</source>
<extracomment>Register with an email</extracomment>
<translation>S&apos;enregistrer avec un email</translation>
</message>
<message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="64"/>
<source>return_accessible_name</source> <source>return_accessible_name</source>
<extracomment>Return</extracomment> <extracomment>Return</extracomment>
<translation>Retour</translation> <translation>Retour</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="58"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="76"/>
<source>assistant_account_register</source> <source>assistant_account_register</source>
<extracomment>&quot;Inscription</extracomment> <extracomment>&quot;Inscription</extracomment>
<translation>Inscription</translation> <translation>Inscription</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="77"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="95"/>
<source>assistant_already_have_an_account</source> <source>assistant_already_have_an_account</source>
<translation>Déjà un compte ?</translation> <translation>Déjà un compte ?</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="85"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="103"/>
<source>assistant_account_login</source> <source>assistant_account_login</source>
<translation>Connexion</translation> <translation>Connexion</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="107"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="125"/>
<source>assistant_account_register_with_phone_number</source> <source>assistant_account_register_with_phone_number</source>
<translation>S&apos;inscrire avec un numéro de téléphone</translation> <translation>S&apos;inscrire avec un numéro de téléphone</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="109"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="127"/>
<source>assistant_account_register_with_email</source> <source>assistant_account_register_with_email</source>
<translation>S&apos;inscrire avec un email</translation> <translation>S&apos;inscrire avec un email</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="138"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="156"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="147"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="165"/>
<source>username</source> <source>username</source>
<translation>Nom d&apos;utilisateur</translation> <translation>Nom d&apos;utilisateur</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="147"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="165"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="182"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="200"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="196"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="214"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="220"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="238"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="236"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="254"/>
<source>mandatory_field_accessible_name</source> <source>mandatory_field_accessible_name</source>
<extracomment>&quot;%1 mandatory&quot;</extracomment> <extracomment>&quot;%1 mandatory&quot;</extracomment>
<translation>%1 requit</translation> <translation>%1 requit</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="158"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="176"/>
<source>domain</source> <source>domain</source>
<translation>Domaine</translation> <translation>Domaine</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="176"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="194"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="179"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="197"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="182"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="200"/>
<source>phone_number</source> <source>phone_number</source>
<extracomment>&quot;Numéro de téléphone&quot;</extracomment> <extracomment>&quot;Numéro de téléphone&quot;</extracomment>
<translation>Numéro de téléphone</translation> <translation>Numéro de téléphone</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="188"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="206"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="196"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="214"/>
<source>email</source> <source>email</source>
<translation>Email</translation> <translation>Email</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="210"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="228"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="220"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="238"/>
<source>password</source> <source>password</source>
<translation>Mot de passe</translation> <translation>Mot de passe</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="227"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="245"/>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="236"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="254"/>
<source>assistant_account_register_password_confirmation</source> <source>assistant_account_register_password_confirmation</source>
<extracomment>&quot;Confirmation mot de passe&quot;</extracomment> <extracomment>&quot;Confirmation mot de passe&quot;</extracomment>
<translation>Confirmation mot de passe</translation> <translation>Confirmation mot de passe</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="272"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="290"/>
<source>assistant_dialog_cgu_and_privacy_policy_message</source> <source>assistant_dialog_cgu_and_privacy_policy_message</source>
<extracomment>&quot;J&apos;accepte les %1 et la %2&quot;</extracomment> <extracomment>&quot;J&apos;accepte les %1 et la %2&quot;</extracomment>
<translation>J&apos;accepte les %1 et la %2</translation> <translation>J&apos;accepte les %1 et la %2</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="274"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="292"/>
<source>assistant_dialog_general_terms_label</source> <source>assistant_dialog_general_terms_label</source>
<extracomment>&quot;conditions d&apos;utilisation&quot;</extracomment> <extracomment>&quot;conditions d&apos;utilisation&quot;</extracomment>
<translation>conditions d&apos;utilisation</translation> <translation>conditions d&apos;utilisation</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="276"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="294"/>
<source>assistant_dialog_privacy_policy_label</source> <source>assistant_dialog_privacy_policy_label</source>
<extracomment>&quot;politique de confidentialité&quot;</extracomment> <extracomment>&quot;politique de confidentialité&quot;</extracomment>
<translation>politique de confidentialité</translation> <translation>politique de confidentialité</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="311"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="329"/>
<source>assistant_account_create</source> <source>assistant_account_create</source>
<extracomment>&quot;Créer&quot;</extracomment> <extracomment>&quot;Créer&quot;</extracomment>
<translation>Créer</translation> <translation>Créer</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="316"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="334"/>
<source>assistant_account_create_missing_username_error</source> <source>assistant_account_create_missing_username_error</source>
<extracomment>&quot;Veuillez entrer un nom d&apos;utilisateur&quot;</extracomment> <extracomment>&quot;Veuillez entrer un nom d&apos;utilisateur&quot;</extracomment>
<translation>Veuillez entrer un nom d&apos;utilisateur</translation> <translation>Veuillez entrer un nom d&apos;utilisateur</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="320"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="338"/>
<source>assistant_account_create_missing_password_error</source> <source>assistant_account_create_missing_password_error</source>
<extracomment>&quot;Veuillez entrer un mot de passe&quot;</extracomment> <extracomment>&quot;Veuillez entrer un mot de passe&quot;</extracomment>
<translation>Veuillez entrer un mot de passe</translation> <translation>Veuillez entrer un mot de passe</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="324"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="342"/>
<source>assistant_account_create_confirm_password_error</source> <source>assistant_account_create_confirm_password_error</source>
<extracomment>&quot;Les mots de passe sont différents&quot;</extracomment> <extracomment>&quot;Les mots de passe sont différents&quot;</extracomment>
<translation>Les mots de passe sont différents</translation> <translation>Les mots de passe sont différents</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="328"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="346"/>
<source>assistant_account_create_missing_number_error</source> <source>assistant_account_create_missing_number_error</source>
<extracomment>&quot;Veuillez entrer un numéro de téléphone&quot;</extracomment> <extracomment>&quot;Veuillez entrer un numéro de téléphone&quot;</extracomment>
<translation>Veuillez entrer un numéro de téléphone</translation> <translation>Veuillez entrer un numéro de téléphone</translation>
</message> </message>
<message> <message>
<location filename="../../view/Page/Form/Register/RegisterPage.qml" line="332"/> <location filename="../../view/Page/Form/Register/RegisterPage.qml" line="350"/>
<source>assistant_account_create_missing_email_error</source> <source>assistant_account_create_missing_email_error</source>
<extracomment>&quot;Veuillez entrer un email&quot;</extracomment> <extracomment>&quot;Veuillez entrer un email&quot;</extracomment>
<translation>Veuillez entrer un email</translation> <translation>Veuillez entrer un email</translation>
@ -6433,6 +6466,28 @@ Pour les activer dans un projet commercial, merci de nous contacter.</translatio
<translation>Enregistrer</translation> <translation>Enregistrer</translation>
</message> </message>
</context> </context>
<context>
<name>SoundPlayerModel</name>
<message>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="65"/>
<source>sound_player_pause_error</source>
<extracomment>Unable to pause</extracomment>
<translation>Impossible de mettre en pause</translation>
</message>
<message>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="87"/>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="107"/>
<source>sound_player_open_error</source>
<extracomment>Unable to open: `%1`</extracomment>
<translation>Impossible d&apos;ouvrir : &quot;%1&quot;</translation>
</message>
<message>
<location filename="../../model/sound-player/SoundPlayerModel.cpp" line="92"/>
<source>sound_player_play_error</source>
<extracomment>Unable to play %1</extracomment>
<translation>Impossible de jouer %1</translation>
</message>
</context>
<context> <context>
<name>Sticker</name> <name>Sticker</name>
<message> <message>
@ -6504,6 +6559,12 @@ Pour les activer dans un projet commercial, merci de nous contacter.</translatio
<extracomment>&quot;Unknown device&quot;</extracomment> <extracomment>&quot;Unknown device&quot;</extracomment>
<translation>Appareil inconnu</translation> <translation>Appareil inconnu</translation>
</message> </message>
<message>
<location filename="../../model/tool/ToolModel.cpp" line="660"/>
<source>Dummy subject</source>
<extracomment>Dummy subject</extracomment>
<translation>Sujet par défaut</translation>
</message>
<message> <message>
<location filename="../../model/tool/ToolModel.cpp" line="548"/> <location filename="../../model/tool/ToolModel.cpp" line="548"/>
<source>conference_invitation</source> <source>conference_invitation</source>

4
Linphone/model/account/AccountManager.cpp
View file

@ -311,7 +311,9 @@ void AccountManager::registerNewAccount(const QString &username,
} else if (request->getType() == } else if (request->getType() ==
linphone::AccountManagerServicesRequest::Type::SendPhoneNumberLinkingCodeBySms) { linphone::AccountManagerServicesRequest::Type::SendPhoneNumberLinkingCodeBySms) {
lInfo() << "[AccountManager] error sending code to phone number" << errorMessage; lInfo() << "[AccountManager] error sending code to phone number" << errorMessage;
if (parameterErrors) { if (statusCode == 422) {
emit phoneNumberValidationNotAvailable();
} else if (parameterErrors) {
for (const std::string &key : parameterErrors->getKeys()) { for (const std::string &key : parameterErrors->getKeys()) {
emit errorInField(Utils::coreStringToAppString(key), emit errorInField(Utils::coreStringToAppString(key),
Utils::coreStringToAppString(errorMessage)); Utils::coreStringToAppString(errorMessage));

1
Linphone/model/account/AccountManager.hpp
View file

@ -66,6 +66,7 @@ signals:
void errorInField(const QString &field, const QString &error); void errorInField(const QString &field, const QString &error);
void linkingNewAccountWithCodeSucceed(); void linkingNewAccountWithCodeSucceed();
void linkingNewAccountWithCodeFailed(const QString &error); void linkingNewAccountWithCodeFailed(const QString &error);
void phoneNumberValidationNotAvailable();
private: private:
std::shared_ptr<AccountModel> mAccountModel; std::shared_ptr<AccountModel> mAccountModel;

2
Linphone/model/chat/message/ChatMessageModel.cpp
View file

@ -34,7 +34,7 @@ ChatMessageModel::ChatMessageModel(const std::shared_ptr<linphone::ChatMessage>
: ::Listener<linphone::ChatMessage, linphone::ChatMessageListener>(chatMessage, parent) { : ::Listener<linphone::ChatMessage, linphone::ChatMessageListener>(chatMessage, parent) {
// lDebug() << "[ChatMessageModel] new" << this << " / SDKModel=" << chatMessage.get(); // lDebug() << "[ChatMessageModel] new" << this << " / SDKModel=" << chatMessage.get();
mustBeInLinphoneThread(getClassName()); mustBeInLinphoneThread(getClassName());
mEphemeralTimer.setInterval(60); mEphemeralTimer.setInterval(1000);
mEphemeralTimer.setSingleShot(false); mEphemeralTimer.setSingleShot(false);
if (mMonitor->getEphemeralExpireTime() != 0) mEphemeralTimer.start(); if (mMonitor->getEphemeralExpireTime() != 0) mEphemeralTimer.start();
mChatRoom = mMonitor->getChatRoom(); mChatRoom = mMonitor->getChatRoom();

8
Linphone/model/sound-player/SoundPlayerModel.cpp
View file

@ -62,7 +62,7 @@ SoundPlayerModel::~SoundPlayerModel() {
void SoundPlayerModel::pause() { void SoundPlayerModel::pause() {
if (mMonitor->pause()) { if (mMonitor->pause()) {
//: Unable to pause //: Unable to pause
emit errorChanged("sound_player_pause_error"); emit errorChanged(tr("sound_player_pause_error"));
emit playbackStateChanged(LinphoneEnums::PlaybackState::ErrorState); emit playbackStateChanged(LinphoneEnums::PlaybackState::ErrorState);
return; return;
} }
@ -84,12 +84,12 @@ bool SoundPlayerModel::play(QString source, bool fromStart) {
if (!open(source)) { if (!open(source)) {
lWarning() << QStringLiteral("[SoundPlayerModel] %1 Unable to open: `%2`").arg(Q_FUNC_INFO).arg(source); lWarning() << QStringLiteral("[SoundPlayerModel] %1 Unable to open: `%2`").arg(Q_FUNC_INFO).arg(source);
//: Unable to open: `%1` //: Unable to open: `%1`
emit errorChanged(QString("sound_player_open_error").arg(source)); emit errorChanged(tr("sound_player_open_error").arg(source));
return false; return false;
} }
if (mMonitor->start()) { if (mMonitor->start()) {
//: Unable to play %1 //: Unable to play %1
emit errorChanged(QString("sound_player_play_error").arg(source)); emit errorChanged(tr("sound_player_play_error").arg(source));
emit playbackStateChanged(LinphoneEnums::PlaybackState::ErrorState); emit playbackStateChanged(LinphoneEnums::PlaybackState::ErrorState);
return false; return false;
} }
@ -104,7 +104,7 @@ void SoundPlayerModel::seek(QString source, int offset) {
if (!open(source)) { if (!open(source)) {
lWarning() << QStringLiteral("[SoundPlayerModel] %1 Unable to open: `%2`").arg(Q_FUNC_INFO).arg(source); lWarning() << QStringLiteral("[SoundPlayerModel] %1 Unable to open: `%2`").arg(Q_FUNC_INFO).arg(source);
//: Unable to open: `%1` //: Unable to open: `%1`
emit errorChanged(QString("sound_player_open_error").arg(source)); emit errorChanged(tr("sound_player_open_error").arg(source));
return; return;
} }
mMonitor->seek(offset); mMonitor->seek(offset);

2
Linphone/model/tool/ToolModel.cpp
View file

@ -657,7 +657,7 @@ ToolModel::getChatRoomParams(std::shared_ptr<linphone::Call> call, std::shared_p
params->enableChat(true); params->enableChat(true);
params->enableGroup(false); params->enableGroup(false);
//: Dummy subject //: Dummy subject
params->setSubject("Dummy subject"); params->setSubject(Utils::appStringToCoreString(tr("Dummy subject")));
params->setAccount(account); params->setAccount(account);
params->enableAudio(false); params->enableAudio(false);
params->enableVideo(false); params->enableVideo(false);

2
Linphone/view/Control/Display/Chat/ChatMessageInvitationBubble.qml
View file

@ -175,10 +175,10 @@ ColumnLayout {
} }
} }
Text { Text {
//: from %1 to %2 (UTC%3)
property string offsetFromUtc: conferenceInfo.timeZoneModel.offsetFromUtc > 0 property string offsetFromUtc: conferenceInfo.timeZoneModel.offsetFromUtc > 0
? "+" + conferenceInfo.timeZoneModel.offsetFromUtc/3600 ? "+" + conferenceInfo.timeZoneModel.offsetFromUtc/3600
: conferenceInfo.timeZoneModel.offsetFromUtc/3600 : conferenceInfo.timeZoneModel.offsetFromUtc/3600
//: from %1 to %2 (UTC%3)
text: qsTr("").arg( text: qsTr("").arg(
conferenceInfo.dateTime.toLocaleString(Qt.locale(), "hh:mm")).arg( conferenceInfo.dateTime.toLocaleString(Qt.locale(), "hh:mm")).arg(
conferenceInfo.endDateTime.toLocaleString(Qt.locale(), "hh:mm")).arg(offsetFromUtc) conferenceInfo.endDateTime.toLocaleString(Qt.locale(), "hh:mm")).arg(offsetFromUtc)

20
Linphone/view/Page/Form/Register/RegisterPage.qml
View file

@ -15,6 +15,21 @@ LoginLayout {
readonly property string phoneNumber: phoneNumberInput.phoneNumber readonly property string phoneNumber: phoneNumberInput.phoneNumber
readonly property string email: emailInput.text readonly property string email: emailInput.text
Dialog {
id: phoneNumberNotAvailableDialog
//: Phone number validation not available
title: qsTr("phone_number_validation_not_available_title")
//: Phone number validation is not available, please use email account creation process
text: qsTr("phone_number_validation_not_available_text")
//: Register with an email
firstButtonText: qsTr("register_with_email_button")
onAccepted: {
bar.setCurrentIndex(1)
close()
}
onRejected: close()
}
Connections { Connections {
target: RegisterPageCpp target: RegisterPageCpp
function onErrorInField(field, errorMessage) { function onErrorInField(field, errorMessage) {
@ -29,6 +44,9 @@ LoginLayout {
console.log("register failed", errorMessage) console.log("register failed", errorMessage)
otherErrorText.setText(errorMessage) otherErrorText.setText(errorMessage)
} }
function onPhoneNumberValidationNotAvailable() {
phoneNumberNotAvailableDialog.open()
}
} }
titleContent: [ titleContent: [
@ -99,8 +117,8 @@ LoginLayout {
spacing: Utils.getSizeWithScreenRatio(50) spacing: Utils.getSizeWithScreenRatio(50)
TabBar { TabBar {
Layout.fillWidth: true
id: bar id: bar
Layout.fillWidth: true
spacing: Utils.getSizeWithScreenRatio(40) spacing: Utils.getSizeWithScreenRatio(40)
Layout.rightMargin: Math.max(Utils.getSizeWithScreenRatio(5), Utils.getSizeWithScreenRatio(127 - ((127/(DefaultStyle.defaultWidth - mainWindow.minimumWidth))*(DefaultStyle.defaultWidth-mainWindow.width)))) Layout.rightMargin: Math.max(Utils.getSizeWithScreenRatio(5), Utils.getSizeWithScreenRatio(127 - ((127/(DefaultStyle.defaultWidth - mainWindow.minimumWidth))*(DefaultStyle.defaultWidth-mainWindow.width))))
// "S'inscrire avec un numéro de téléphone" // "S'inscrire avec un numéro de téléphone"