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 oidc without restarting app (do not recreate CoreModel and no need to clear all mengine singletons)

See merge request BC/public/linphone-desktop!1806
This commit is contained in:
Gaëlle Braud 2026-04-09 16:13:19 +00:00
commit 0b73d1b3b9
5 changed files with 101 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Linphone/core/App.cpp
View file

@ -343,13 +343,6 @@ App::App(int &argc, char *argv[])
connect(this, &App::restartCoreRequested, this, [this] { connect(this, &App::restartCoreRequested, this, [this] {
initCore(); initCore();
if (mCliModelConnection) mCliModelConnection->disconnect();
if (mCoreModelConnection) {
mCoreModelConnection->disconnect();
mCoreModelConnection->setModel(CoreModel::getInstance());
}
// reset connections with the new CoreModel
resetConnections();
sendCommand(false); sendCommand(false);
setIsRestarting(false); setIsRestarting(false);
}); });
@ -362,11 +355,6 @@ App::App(int &argc, char *argv[])
App::~App() { App::~App() {
} }
void App::resetConnections() {
connectCoreModel();
connectCliModel();
}
void App::connectCoreModel() { void App::connectCoreModel() {
Q_ASSERT(mCoreModelConnection); Q_ASSERT(mCoreModelConnection);
mCoreModelConnection->makeConnectToModel(&CoreModel::callCreated, mCoreModelConnection->makeConnectToModel(&CoreModel::callCreated,
@ -691,7 +679,11 @@ void App::init() {
void App::initCore() { void App::initCore() {
mustBeInMainThread(log().arg(Q_FUNC_INFO)); mustBeInMainThread(log().arg(Q_FUNC_INFO));
// Core. Manage the logger so it must be instantiate at first. // Core. Manage the logger so it must be instantiate at first.
CoreModel::create("", mLinphoneThread); if (!CoreModel::getInstance()) CoreModel::create("", mLinphoneThread);
else {
lDebug() << "CoreModel already exists, juste start core";
// CoreModel::getInstance()->getCore()->start();
}
if (mParser->isSet("verbose")) QtLogger::enableVerbose(true); if (mParser->isSet("verbose")) QtLogger::enableVerbose(true);
if (mParser->isSet("qt-logs-only")) QtLogger::enableQtOnly(true); if (mParser->isSet("qt-logs-only")) QtLogger::enableQtOnly(true);
qDebug() << "linphone thread is" << mLinphoneThread; qDebug() << "linphone thread is" << mLinphoneThread;
@ -769,6 +761,7 @@ void App::initCore() {
mEngine->rootContext()->setContextProperty("executableName", EXECUTABLE_NAME); mEngine->rootContext()->setContextProperty("executableName", EXECUTABLE_NAME);
mEngine->rootContext()->setContextProperty("FocusNavigator", new FocusNavigator(mEngine)); mEngine->rootContext()->setContextProperty("FocusNavigator", new FocusNavigator(mEngine));
if (!isRestarting()) {
initCppInterfaces(); initCppInterfaces();
mEngine->addImageProvider(ImageProvider::ProviderId, new ImageProvider()); mEngine->addImageProvider(ImageProvider::ProviderId, new ImageProvider());
mEngine->addImageProvider(EmojiProvider::ProviderId, new EmojiProvider()); mEngine->addImageProvider(EmojiProvider::ProviderId, new EmojiProvider());
@ -777,6 +770,7 @@ void App::initCore() {
mEngine->addImageProvider(WindowProvider::ProviderId, new WindowProvider()); mEngine->addImageProvider(WindowProvider::ProviderId, new WindowProvider());
mEngine->addImageProvider(WindowIconProvider::ProviderId, new WindowIconProvider()); mEngine->addImageProvider(WindowIconProvider::ProviderId, new WindowIconProvider());
mEngine->addImageProvider(ThumbnailProvider::ProviderId, new ThumbnailProvider()); mEngine->addImageProvider(ThumbnailProvider::ProviderId, new ThumbnailProvider());
}
// Enable notifications. // Enable notifications.
if (!mNotifier) mNotifier = new Notifier(mEngine); if (!mNotifier) mNotifier = new Notifier(mEngine);
@ -1165,8 +1159,8 @@ void App::restartCore() {
closeCallsWindow(); closeCallsWindow();
// setMainWindow(nullptr); // setMainWindow(nullptr);
setCoreStarted(false); setCoreStarted(false);
mEngine->clearComponentCache(); // mEngine->clearComponentCache();
mEngine->clearSingletons(); // mEngine->clearSingletons();
// delete mEngine; // delete mEngine;
// mEngine = nullptr; // mEngine = nullptr;
// clean(); // clean();

1
Linphone/core/App.hpp
View file

@ -66,7 +66,6 @@ public:
App(int &argc, char *argv[]); App(int &argc, char *argv[]);
~App(); ~App();
void setSelf(QSharedPointer<App>(me)); void setSelf(QSharedPointer<App>(me));
void resetConnections();
void connectCoreModel(); void connectCoreModel();
void connectCliModel(); void connectCliModel();
static App *getInstance(); static App *getInstance();

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

@ -686,145 +686,145 @@
<context> <context>
<name>App</name> <name>App</name>
<message> <message>
<location filename="../../core/App.cpp" line="400"/> <location filename="../../core/App.cpp" line="388"/>
<source>remote_provisioning_dialog</source> <source>remote_provisioning_dialog</source>
<extracomment>Voulez-vous télécharger et appliquer la configuration depuis cette adresse ?</extracomment> <extracomment>Voulez-vous télécharger et appliquer la configuration depuis cette adresse ?</extracomment>
<translation>Möchten Sie die Remote-Konfiguration von dieser Adresse herunterladen und anwenden?</translation> <translation>Möchten Sie die Remote-Konfiguration von dieser Adresse herunterladen und anwenden?</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="449"/>
<location filename="../../core/App.cpp" line="457"/>
<location filename="../../core/App.cpp" line="461"/> <location filename="../../core/App.cpp" line="461"/>
<location filename="../../core/App.cpp" line="469"/> <location filename="../../core/App.cpp" line="537"/>
<location filename="../../core/App.cpp" line="473"/> <location filename="../../core/App.cpp" line="883"/>
<location filename="../../core/App.cpp" line="549"/>
<location filename="../../core/App.cpp" line="889"/>
<source>info_popup_error_title</source> <source>info_popup_error_title</source>
<extracomment>Error</extracomment> <extracomment>Error</extracomment>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="462"/> <location filename="../../core/App.cpp" line="450"/>
<location filename="../../core/App.cpp" line="891"/> <location filename="../../core/App.cpp" line="885"/>
<source>info_popup_configuration_failed_message</source> <source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment> <extracomment>Remote provisioning failed : %1</extracomment>
<translation>Remote-Provisionierung fehlgeschlagen: %1</translation> <translation>Remote-Provisionierung fehlgeschlagen: %1</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="552"/> <location filename="../../core/App.cpp" line="540"/>
<source>info_popup_error_checking_update</source> <source>info_popup_error_checking_update</source>
<extracomment>An error occured while trying to check update. Please try again later or contact support team.</extracomment> <extracomment>An error occured while trying to check update. Please try again later or contact support team.</extracomment>
<translation>Fehler bei der Update-Prüfung. Bitte später erneut versuchen oder Support-Team kontaktieren.</translation> <translation>Fehler bei der Update-Prüfung. Bitte später erneut versuchen oder Support-Team kontaktieren.</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="559"/> <location filename="../../core/App.cpp" line="547"/>
<source>info_popup_new_version_download_label</source> <source>info_popup_new_version_download_label</source>
<extracomment>Download it !</extracomment> <extracomment>Download it !</extracomment>
<translation>Herunterladen!</translation> <translation>Herunterladen!</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="562"/> <location filename="../../core/App.cpp" line="550"/>
<source>info_popup_new_version_available_title</source> <source>info_popup_new_version_available_title</source>
<extracomment>New version available !</extracomment> <extracomment>New version available !</extracomment>
<translation>Neue Version verfügbar!</translation> <translation>Neue Version verfügbar!</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="564"/> <location filename="../../core/App.cpp" line="552"/>
<source>info_popup_new_version_available_message</source> <source>info_popup_new_version_available_message</source>
<extracomment>A new version of Linphone (%1) is available. %2</extracomment> <extracomment>A new version of Linphone (%1) is available. %2</extracomment>
<translation>Eine neue Version von Linphone (%1) ist unter %1 verfügbar</translation> <translation>Eine neue Version von Linphone (%1) ist unter %1 verfügbar</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="572"/> <location filename="../../core/App.cpp" line="560"/>
<source>info_popup_version_up_to_date_title</source> <source>info_popup_version_up_to_date_title</source>
<extracomment>Up to date</extracomment> <extracomment>Up to date</extracomment>
<translation>Auf dem neuesten Stand</translation> <translation>Auf dem neuesten Stand</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="574"/> <location filename="../../core/App.cpp" line="562"/>
<source>info_popup_version_up_to_date_message</source> <source>info_popup_version_up_to_date_message</source>
<extracomment>Your version is up to date</extracomment> <extracomment>Your version is up to date</extracomment>
<translation>Ihre Version ist auf dem neuesten Stand</translation> <translation>Ihre Version ist auf dem neuesten Stand</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="884"/> <location filename="../../core/App.cpp" line="878"/>
<source>configuration_error_detail</source> <source>configuration_error_detail</source>
<extracomment>not reachable</extracomment> <extracomment>not reachable</extracomment>
<translation>nicht erreichbar</translation> <translation>nicht erreichbar</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1184"/> <location filename="../../core/App.cpp" line="1178"/>
<source>application_description</source> <source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment> <extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>Ein kostenloses Open-Source SIP Video-Telefon.</translation> <translation>Ein kostenloses Open-Source SIP Video-Telefon.</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1186"/> <location filename="../../core/App.cpp" line="1180"/>
<source>command_line_arg_order</source> <source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment> <extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Kommandozeilen-Befehl an die Anwendung schicken</translation> <translation>Kommandozeilen-Befehl an die Anwendung schicken</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1190"/> <location filename="../../core/App.cpp" line="1184"/>
<source>command_line_option_show_help</source> <source>command_line_option_show_help</source>
<translation>Zeige Hilfe</translation> <translation>Zeige Hilfe</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1195"/> <location filename="../../core/App.cpp" line="1189"/>
<source>command_line_option_show_app_version</source> <source>command_line_option_show_app_version</source>
<translation>App-Version anzeigen</translation> <translation>App-Version anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1203"/> <location filename="../../core/App.cpp" line="1197"/>
<source>command_line_option_config_to_fetch</source> <source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment> <extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Abzurufende Linphone-Konfigurationsdatei angeben. Sie wird mit der aktuellen Konfiguration zusammengeführt.</translation> <translation>Abzurufende Linphone-Konfigurationsdatei angeben. Sie wird mit der aktuellen Konfiguration zusammengeführt.</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1205"/> <location filename="../../core/App.cpp" line="1199"/>
<source>command_line_option_config_to_fetch_arg</source> <source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment> <extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, Pfad oder Datei</translation> <translation>URL, Pfad oder Datei</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1210"/> <location filename="../../core/App.cpp" line="1204"/>
<source>command_line_option_minimized</source> <source>command_line_option_minimized</source>
<translation>Minimieren</translation> <translation>Minimieren</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1213"/> <location filename="../../core/App.cpp" line="1207"/>
<source>command_line_option_log_to_stdout</source> <source>command_line_option_log_to_stdout</source>
<translation>Debug-Informationen auf der Standardausgabe ausgeben</translation> <translation>Debug-Informationen auf der Standardausgabe ausgeben</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1216"/> <location filename="../../core/App.cpp" line="1210"/>
<source>command_line_option_print_app_logs_only</source> <source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment> <extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Nur Anwendungs-Logs ausgeben</translation> <translation>Nur Anwendungs-Logs ausgeben</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1677"/> <location filename="../../core/App.cpp" line="1671"/>
<source>hide_action</source> <source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment> <extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Ausblenden</translation> <translation>Ausblenden</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1677"/> <location filename="../../core/App.cpp" line="1671"/>
<source>show_action</source> <source>show_action</source>
<translation>Zeigen</translation> <translation>Zeigen</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1692"/> <location filename="../../core/App.cpp" line="1686"/>
<source>quit_action</source> <source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment> <extracomment>&quot;Quitter&quot;</extracomment>
<translation>Beenden</translation> <translation>Beenden</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1710"/> <location filename="../../core/App.cpp" line="1704"/>
<source>check_for_update</source> <source>check_for_update</source>
<extracomment>Check for update</extracomment> <extracomment>Check for update</extracomment>
<translation>Auf Updates prüfen</translation> <translation>Auf Updates prüfen</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1859"/> <location filename="../../core/App.cpp" line="1853"/>
<source>mark_all_read_action</source> <source>mark_all_read_action</source>
<translation>Alle als gelesen markieren</translation> <translation>Alle als gelesen markieren</translation>
</message> </message>

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

@ -672,145 +672,145 @@
<context> <context>
<name>App</name> <name>App</name>
<message> <message>
<location filename="../../core/App.cpp" line="400"/> <location filename="../../core/App.cpp" line="388"/>
<source>remote_provisioning_dialog</source> <source>remote_provisioning_dialog</source>
<extracomment>Voulez-vous télécharger et appliquer la configuration depuis cette adresse ?</extracomment> <extracomment>Voulez-vous télécharger et appliquer la configuration depuis cette adresse ?</extracomment>
<translation>Do you want to download and apply remote provisioning from this address ?</translation> <translation>Do you want to download and apply remote provisioning from this address ?</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="449"/>
<location filename="../../core/App.cpp" line="457"/>
<location filename="../../core/App.cpp" line="461"/> <location filename="../../core/App.cpp" line="461"/>
<location filename="../../core/App.cpp" line="469"/> <location filename="../../core/App.cpp" line="537"/>
<location filename="../../core/App.cpp" line="473"/> <location filename="../../core/App.cpp" line="883"/>
<location filename="../../core/App.cpp" line="549"/>
<location filename="../../core/App.cpp" line="889"/>
<source>info_popup_error_title</source> <source>info_popup_error_title</source>
<extracomment>Error</extracomment> <extracomment>Error</extracomment>
<translation>Error</translation> <translation>Error</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="462"/> <location filename="../../core/App.cpp" line="450"/>
<location filename="../../core/App.cpp" line="891"/> <location filename="../../core/App.cpp" line="885"/>
<source>info_popup_configuration_failed_message</source> <source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment> <extracomment>Remote provisioning failed : %1</extracomment>
<translation>Remote provisioning failed : %1</translation> <translation>Remote provisioning failed : %1</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="552"/> <location filename="../../core/App.cpp" line="540"/>
<source>info_popup_error_checking_update</source> <source>info_popup_error_checking_update</source>
<extracomment>An error occured while trying to check update. Please try again later or contact support team.</extracomment> <extracomment>An error occured while trying to check update. Please try again later or contact support team.</extracomment>
<translation>An error occured while trying to check update. Please try again later or contact support team.</translation> <translation>An error occured while trying to check update. Please try again later or contact support team.</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="559"/> <location filename="../../core/App.cpp" line="547"/>
<source>info_popup_new_version_download_label</source> <source>info_popup_new_version_download_label</source>
<extracomment>Download it !</extracomment> <extracomment>Download it !</extracomment>
<translation>Download it !</translation> <translation>Download it !</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="562"/> <location filename="../../core/App.cpp" line="550"/>
<source>info_popup_new_version_available_title</source> <source>info_popup_new_version_available_title</source>
<extracomment>New version available !</extracomment> <extracomment>New version available !</extracomment>
<translation>New version available !</translation> <translation>New version available !</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="564"/> <location filename="../../core/App.cpp" line="552"/>
<source>info_popup_new_version_available_message</source> <source>info_popup_new_version_available_message</source>
<extracomment>A new version of Linphone (%1) is available. %2</extracomment> <extracomment>A new version of Linphone (%1) is available. %2</extracomment>
<translation>A new version of Linphone (%1) is available at %1</translation> <translation>A new version of Linphone (%1) is available at %1</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="572"/> <location filename="../../core/App.cpp" line="560"/>
<source>info_popup_version_up_to_date_title</source> <source>info_popup_version_up_to_date_title</source>
<extracomment>Up to date</extracomment> <extracomment>Up to date</extracomment>
<translation>Up to date</translation> <translation>Up to date</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="574"/> <location filename="../../core/App.cpp" line="562"/>
<source>info_popup_version_up_to_date_message</source> <source>info_popup_version_up_to_date_message</source>
<extracomment>Your version is up to date</extracomment> <extracomment>Your version is up to date</extracomment>
<translation>Up to date Your version is up to date</translation> <translation>Up to date Your version is up to date</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="884"/> <location filename="../../core/App.cpp" line="878"/>
<source>configuration_error_detail</source> <source>configuration_error_detail</source>
<extracomment>not reachable</extracomment> <extracomment>not reachable</extracomment>
<translation>not reachable</translation> <translation>not reachable</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1184"/> <location filename="../../core/App.cpp" line="1178"/>
<source>application_description</source> <source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment> <extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>A free and open source SIP video-phone.</translation> <translation>A free and open source SIP video-phone.</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1186"/> <location filename="../../core/App.cpp" line="1180"/>
<source>command_line_arg_order</source> <source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment> <extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Send an order to the application towards a command line</translation> <translation>Send an order to the application towards a command line</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1190"/> <location filename="../../core/App.cpp" line="1184"/>
<source>command_line_option_show_help</source> <source>command_line_option_show_help</source>
<translation>Show this help</translation> <translation>Show this help</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1195"/> <location filename="../../core/App.cpp" line="1189"/>
<source>command_line_option_show_app_version</source> <source>command_line_option_show_app_version</source>
<translation>Show app version</translation> <translation>Show app version</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1203"/> <location filename="../../core/App.cpp" line="1197"/>
<source>command_line_option_config_to_fetch</source> <source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment> <extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation> <translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1205"/> <location filename="../../core/App.cpp" line="1199"/>
<source>command_line_option_config_to_fetch_arg</source> <source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment> <extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, path or file</translation> <translation>URL, path or file</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1210"/> <location filename="../../core/App.cpp" line="1204"/>
<source>command_line_option_minimized</source> <source>command_line_option_minimized</source>
<translation>Minimize</translation> <translation>Minimize</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1213"/> <location filename="../../core/App.cpp" line="1207"/>
<source>command_line_option_log_to_stdout</source> <source>command_line_option_log_to_stdout</source>
<translation>Log to stdout some debug information while running</translation> <translation>Log to stdout some debug information while running</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1216"/> <location filename="../../core/App.cpp" line="1210"/>
<source>command_line_option_print_app_logs_only</source> <source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment> <extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Print only logs from the application</translation> <translation>Print only logs from the application</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1677"/> <location filename="../../core/App.cpp" line="1671"/>
<source>hide_action</source> <source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment> <extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Hide</translation> <translation>Hide</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1677"/> <location filename="../../core/App.cpp" line="1671"/>
<source>show_action</source> <source>show_action</source>
<translation>Show</translation> <translation>Show</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1692"/> <location filename="../../core/App.cpp" line="1686"/>
<source>quit_action</source> <source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment> <extracomment>&quot;Quitter&quot;</extracomment>
<translation>Quit</translation> <translation>Quit</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1710"/> <location filename="../../core/App.cpp" line="1704"/>
<source>check_for_update</source> <source>check_for_update</source>
<extracomment>Check for update</extracomment> <extracomment>Check for update</extracomment>
<translation>Check for update</translation> <translation>Check for update</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1859"/> <location filename="../../core/App.cpp" line="1853"/>
<source>mark_all_read_action</source> <source>mark_all_read_action</source>
<translation>Marquer tout comme lu</translation> <translation>Marquer tout comme lu</translation>
</message> </message>

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

@ -672,145 +672,145 @@
<context> <context>
<name>App</name> <name>App</name>
<message> <message>
<location filename="../../core/App.cpp" line="400"/> <location filename="../../core/App.cpp" line="388"/>
<source>remote_provisioning_dialog</source> <source>remote_provisioning_dialog</source>
<extracomment>Voulez-vous télécharger et appliquer la configuration depuis cette adresse ?</extracomment> <extracomment>Voulez-vous télécharger et appliquer la configuration depuis cette adresse ?</extracomment>
<translation>Voulez-vous télécharger et appliquer la configuration depuis cette adresse ?</translation> <translation>Voulez-vous télécharger et appliquer la configuration depuis cette adresse ?</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="449"/>
<location filename="../../core/App.cpp" line="457"/>
<location filename="../../core/App.cpp" line="461"/> <location filename="../../core/App.cpp" line="461"/>
<location filename="../../core/App.cpp" line="469"/> <location filename="../../core/App.cpp" line="537"/>
<location filename="../../core/App.cpp" line="473"/> <location filename="../../core/App.cpp" line="883"/>
<location filename="../../core/App.cpp" line="549"/>
<location filename="../../core/App.cpp" line="889"/>
<source>info_popup_error_title</source> <source>info_popup_error_title</source>
<extracomment>Error</extracomment> <extracomment>Error</extracomment>
<translation>Erreur</translation> <translation>Erreur</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="462"/> <location filename="../../core/App.cpp" line="450"/>
<location filename="../../core/App.cpp" line="891"/> <location filename="../../core/App.cpp" line="885"/>
<source>info_popup_configuration_failed_message</source> <source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment> <extracomment>Remote provisioning failed : %1</extracomment>
<translation>La configuration distante a échoué : %1</translation> <translation>La configuration distante a échoué : %1</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="552"/> <location filename="../../core/App.cpp" line="540"/>
<source>info_popup_error_checking_update</source> <source>info_popup_error_checking_update</source>
<extracomment>An error occured while trying to check update. Please try again later or contact support team.</extracomment> <extracomment>An error occured while trying to check update. Please try again later or contact support team.</extracomment>
<translation>Une erreur est survenue lors de la recherche de mise à jour. Merci de réessayer plus tard ou de contacter l&apos;équipe de support.</translation> <translation>Une erreur est survenue lors de la recherche de mise à jour. Merci de réessayer plus tard ou de contacter l&apos;équipe de support.</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="559"/> <location filename="../../core/App.cpp" line="547"/>
<source>info_popup_new_version_download_label</source> <source>info_popup_new_version_download_label</source>
<extracomment>Download it !</extracomment> <extracomment>Download it !</extracomment>
<translation>Téléchargez-là&#x202f;!</translation> <translation>Téléchargez-là&#x202f;!</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="562"/> <location filename="../../core/App.cpp" line="550"/>
<source>info_popup_new_version_available_title</source> <source>info_popup_new_version_available_title</source>
<extracomment>New version available !</extracomment> <extracomment>New version available !</extracomment>
<translation>Nouvelle version disponible !</translation> <translation>Nouvelle version disponible !</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="564"/> <location filename="../../core/App.cpp" line="552"/>
<source>info_popup_new_version_available_message</source> <source>info_popup_new_version_available_message</source>
<extracomment>A new version of Linphone (%1) is available. %2</extracomment> <extracomment>A new version of Linphone (%1) is available. %2</extracomment>
<translation>Une nouvelle version de Linphone (%1) est disponible. %2</translation> <translation>Une nouvelle version de Linphone (%1) est disponible. %2</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="572"/> <location filename="../../core/App.cpp" line="560"/>
<source>info_popup_version_up_to_date_title</source> <source>info_popup_version_up_to_date_title</source>
<extracomment>Up to date</extracomment> <extracomment>Up to date</extracomment>
<translation>À jour</translation> <translation>À jour</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="574"/> <location filename="../../core/App.cpp" line="562"/>
<source>info_popup_version_up_to_date_message</source> <source>info_popup_version_up_to_date_message</source>
<extracomment>Your version is up to date</extracomment> <extracomment>Your version is up to date</extracomment>
<translation>Votre version est à jour</translation> <translation>Votre version est à jour</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="884"/> <location filename="../../core/App.cpp" line="878"/>
<source>configuration_error_detail</source> <source>configuration_error_detail</source>
<extracomment>not reachable</extracomment> <extracomment>not reachable</extracomment>
<translation>indisponible</translation> <translation>indisponible</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1184"/> <location filename="../../core/App.cpp" line="1178"/>
<source>application_description</source> <source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment> <extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>A free and open source SIP video-phone.</translation> <translation>A free and open source SIP video-phone.</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1186"/> <location filename="../../core/App.cpp" line="1180"/>
<source>command_line_arg_order</source> <source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment> <extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Send an order to the application towards a command line</translation> <translation>Send an order to the application towards a command line</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1190"/> <location filename="../../core/App.cpp" line="1184"/>
<source>command_line_option_show_help</source> <source>command_line_option_show_help</source>
<translation>Show this help</translation> <translation>Show this help</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1195"/> <location filename="../../core/App.cpp" line="1189"/>
<source>command_line_option_show_app_version</source> <source>command_line_option_show_app_version</source>
<translation>Afficher la version de l&apos;application</translation> <translation>Afficher la version de l&apos;application</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1203"/> <location filename="../../core/App.cpp" line="1197"/>
<source>command_line_option_config_to_fetch</source> <source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment> <extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation> <translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1205"/> <location filename="../../core/App.cpp" line="1199"/>
<source>command_line_option_config_to_fetch_arg</source> <source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment> <extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, path or file</translation> <translation>URL, path or file</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1210"/> <location filename="../../core/App.cpp" line="1204"/>
<source>command_line_option_minimized</source> <source>command_line_option_minimized</source>
<translation>Minimiser</translation> <translation>Minimiser</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1213"/> <location filename="../../core/App.cpp" line="1207"/>
<source>command_line_option_log_to_stdout</source> <source>command_line_option_log_to_stdout</source>
<translation>Log to stdout some debug information while running</translation> <translation>Log to stdout some debug information while running</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1216"/> <location filename="../../core/App.cpp" line="1210"/>
<source>command_line_option_print_app_logs_only</source> <source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment> <extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Print only logs from the application</translation> <translation>Print only logs from the application</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1677"/> <location filename="../../core/App.cpp" line="1671"/>
<source>hide_action</source> <source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment> <extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Cacher</translation> <translation>Cacher</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1677"/> <location filename="../../core/App.cpp" line="1671"/>
<source>show_action</source> <source>show_action</source>
<translation>Afficher</translation> <translation>Afficher</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1692"/> <location filename="../../core/App.cpp" line="1686"/>
<source>quit_action</source> <source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment> <extracomment>&quot;Quitter&quot;</extracomment>
<translation>Quitter</translation> <translation>Quitter</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1710"/> <location filename="../../core/App.cpp" line="1704"/>
<source>check_for_update</source> <source>check_for_update</source>
<extracomment>Check for update</extracomment> <extracomment>Check for update</extracomment>
<translation>Rechercher une mise à jour</translation> <translation>Rechercher une mise à jour</translation>
</message> </message>
<message> <message>
<location filename="../../core/App.cpp" line="1859"/> <location filename="../../core/App.cpp" line="1853"/>
<source>mark_all_read_action</source> <source>mark_all_read_action</source>
<translation>Marquer tout comme lu</translation> <translation>Marquer tout comme lu</translation>
</message> </message>