From 07dc4cac6008bfed08f11a969ca7487c291d2b8e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 28 Oct 2022 15:00:11 +0200 Subject: [PATCH] Avoid triggering the setup detection of wizard automatically when going back Otherwise it is not really possible to go back to the start page. Besides, triggering the setup detection again explicitly might make it more obvious what's going on. --- widgets/settings/wizard.cpp | 38 ++- widgets/settings/wizard.h | 5 + .../translations/syncthingwidgets_cs_CZ.ts | 227 ++++++++++-------- .../translations/syncthingwidgets_de_DE.ts | 217 +++++++++-------- .../translations/syncthingwidgets_en_US.ts | 227 ++++++++++-------- .../translations/syncthingwidgets_zh_CN.ts | 227 ++++++++++-------- 6 files changed, 514 insertions(+), 427 deletions(-) diff --git a/widgets/settings/wizard.cpp b/widgets/settings/wizard.cpp index d7f16f5..b308c14 100644 --- a/widgets/settings/wizard.cpp +++ b/widgets/settings/wizard.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -61,7 +62,7 @@ Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) auto *const mainConfigPage = new MainConfigWizardPage(this); auto *const applyPage = new ApplyWizardPage(this); auto *const finalPage = new FinalWizardPage(this); - connect(mainConfigPage, &MainConfigWizardPage::retry, detectionPage, &DetectionWizardPage::refresh); + connect(mainConfigPage, &MainConfigWizardPage::retry, detectionPage, &DetectionWizardPage::showCheckAgainButton); connect(mainConfigPage, &MainConfigWizardPage::configurationSelected, this, &Wizard::handleConfigurationSelected); connect(this, &Wizard::configApplied, finalPage, &FinalWizardPage::completeChanged); connect(this, &Wizard::configApplied, finalPage, &FinalWizardPage::showResults); @@ -488,15 +489,25 @@ bool WelcomeWizardPage::isComplete() const DetectionWizardPage::DetectionWizardPage(QWidget *parent) : QWizardPage(parent) { - setTitle(tr("Checking current Syncthing setup")); - setSubTitle(tr("Checking Syncthing configuration and whether Syncthing is already running or can be started …")); + setTitle(m_defaultTitle = tr("Checking current Syncthing setup")); + setSubTitle(m_defaultSubTitle = tr("Checking Syncthing configuration and whether Syncthing is already running or can be started …")); - auto *const progressBar = new QProgressBar(this); - progressBar->setMinimum(0); - progressBar->setMaximum(0); + m_progressBar = new QProgressBar(this); + m_progressBar->setMinimum(0); + m_progressBar->setMaximum(0); + m_checkAgainButton = new QPushButton(this); + m_checkAgainButton->setText(tr("Check again")); + m_checkAgainButton->hide(); + m_checkAgainButton->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh"))); + m_checkAgainButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + connect(m_checkAgainButton, &QPushButton::clicked, this, &DetectionWizardPage::refresh); - auto *const layout = new QVBoxLayout; - layout->addWidget(progressBar); + auto *const layout = new QVBoxLayout(this); + auto *const buttonLayout = new QHBoxLayout(this); + buttonLayout->addWidget(m_checkAgainButton); + buttonLayout->addStretch(); + layout->addWidget(m_progressBar); + layout->addLayout(buttonLayout); setLayout(layout); } @@ -530,6 +541,14 @@ void DetectionWizardPage::refresh() initializePage(); } +void DetectionWizardPage::showCheckAgainButton() +{ + setTitle(tr("Re-visit setup detection")); + setSubTitle(tr("You might trigger checking the Syncthing setup again")); + m_progressBar->hide(); + m_checkAgainButton->show(); +} + void DetectionWizardPage::tryToConnect() { // skip if the wizard has been closed @@ -538,6 +557,9 @@ void DetectionWizardPage::tryToConnect() return; } + setTitle(m_defaultTitle); + setSubTitle(m_defaultSubTitle); + // determine path of Syncthing's config file, possibly ask user to select it m_setupDetection->determinePaths(); if (m_setupDetection->configFilePath.isEmpty()) { diff --git a/widgets/settings/wizard.h b/widgets/settings/wizard.h index d2c7bd0..e015f98 100644 --- a/widgets/settings/wizard.h +++ b/widgets/settings/wizard.h @@ -135,6 +135,7 @@ public: public Q_SLOTS: void refresh(); + void showCheckAgainButton(); private Q_SLOTS: void tryToConnect(); @@ -142,6 +143,10 @@ private Q_SLOTS: private: SetupDetection *m_setupDetection; + QString m_defaultTitle; + QString m_defaultSubTitle; + QProgressBar *m_progressBar; + QPushButton *m_checkAgainButton; }; class SYNCTHINGWIDGETS_EXPORT MainConfigWizardPage final : public QWizardPage { diff --git a/widgets/translations/syncthingwidgets_cs_CZ.ts b/widgets/translations/syncthingwidgets_cs_CZ.ts index e7f948d..b4aaef7 100644 --- a/widgets/translations/syncthingwidgets_cs_CZ.ts +++ b/widgets/translations/syncthingwidgets_cs_CZ.ts @@ -163,127 +163,127 @@ - + Apply - + Apply selected configuration - + Review the summary of the configuration changes before applying them - + Summary: - + Keep %1 %2 - + enabled - + disabled - + %1 %2 - + Enable - + Disable - + Keeping connection and launcher configuration as-is - + Configure Syncthing Tray to use the currently running Syncthing instance - + Do <i>not</i> change how Syncthing is launched - + Start Syncthing via Syncthing Tray's launcher - + executable from PATH as separate process, "%1" - + built-in Syncthing library, "%1" - + Start Syncthing by enabling and starting its systemd unit - + Using user unit "%1" - + Using system unit "%1" - + systemd integration - + autostart of Syncthing Tray - + Further information: - + Click on "Show details from setup detection" for further details. - + If you want to do amendments, you can head back one or more steps. - + If you abort now, nothing will be changed. @@ -354,12 +354,12 @@ - + Configure autostart - + Select whether to start Syncthing Tray automatically @@ -622,32 +622,47 @@ QtGui::DetectionWizardPage - + Checking current Syncthing setup - + Checking Syncthing configuration and whether Syncthing is already running or can be started … - - It looks like Syncthing has not been running on this system before as its configuration cannot be found. Is that correct? - - - - - Yes, continue configuration + + Check again + Re-visit setup detection + + + + + You might trigger checking the Syncthing setup again + + + + + It looks like Syncthing has not been running on this system before as its configuration cannot be found. Is that correct? + + + + + Yes, continue configuration + + + + No, let me select Syncthing's configuration file manually - + Select Syncthing's configuration file @@ -692,37 +707,37 @@ QtGui::FinalWizardPage - + Waiting for configuration wizard completed - + Changes are being applied - + Configuration wizard completed - + All changes have been applied - + The configuration has been changed successfully. You can close the wizard and <a href="openSyncthing">open Syncthing</a> to pair remote devices and add folders for sharing. If you need further help, read the <a href="openDocs">documentation to get started</a>. - + Not all changes could be applied - + You may try to head back one or more steps and try again or finish the wizard and configure Syncthing Tray manually. @@ -1060,37 +1075,37 @@ QtGui::MainConfigWizardPage - + Select what configuration to apply - + Something when wrong when checking the Syncthing setup. - + Show details from setup detection - + Systemd - + <b>The Syncthing config could be located under "%1" but it seems invalid/incomplete.</b> Hence Syncthing is assumed to be not running. - + Looks like Syncthing is not running yet. You can launch it via %1. - + and @@ -1135,17 +1150,17 @@ - + Looks like Syncthing is already running and Syncthing Tray can be configured accordingly automatically. - + Syncthing Tray's launcher - + Looks like Syncthing is not running yet and needs to be installed before Syncthing Tray can be configured. @@ -1589,72 +1604,72 @@ The Web UI will be opened in the default web browser instead. QtGui::WelcomeWizardPage - + Welcome to Syncthing Tray - + It looks like you're launching Syncthing Tray for the first time. - + You must configure how to connect to Syncthing and how to launch Syncthing (if that's wanted) when using Syncthing Tray the first time. - + Wizard's start page - + This wizard will help you configuring Syncthing Tray. - + Start guided setup - + Allows to configure Syncthing Tray automatically for the local Syncthing instance and helps you starting Syncthing if wanted. - + Configure connection and launcher settings manually - + Head back to settings to configure connection and launcher manually - + Note that the connection settings allow importing URL, credentials and API-key from the local Syncthing configuration. - + Show Syncthing's documentation - + It contains general information about configuring Syncthing. - + Show Syncthing Tray's README - + It contains documentation about this GUI integration specifically. @@ -1662,192 +1677,192 @@ The Web UI will be opened in the default web browser instead. QtGui::Wizard - + Setup wizard - - + The internal launcher has not been initialized. - + The service handler has not been initialized. - + Unable to locate Syncthing config file. - + Located Syncthing config file: - + Syncthing config file looks ok. - + Syncthing config file looks invalid/incomplete. - + Syncthing configuration: - + Could connect to Syncthing under: - + Syncthing version: - + Syncthing device ID: - + Syncthing status: - + Additional Syncthing status info: - + Autostart: - + Currently %1 - + enabled - + disabled - + The Syncthing process exited prematurely. - + The Syncthing service stopped prematurely. - + Ran into timeout while waiting for Syncthing to create config file. Maybe Syncthing created its config file under an unexpected location. - + Checkout Syncthing's log for details. - + It can be accessed within the <a href="openLauncherSettings">launcher settings</a>. - + It is normally written to the system journal (and can be accessed via e.g. journalctl). - + API connection: - + API connection errors: - + State of user unit file "%1": - + State of system unit file "%1": - + Systemd: - + Could NOT connect to Syncthing under: - + No available - + Could test-launch Syncthing successfully, exit code: - + Syncthing version returned from test-launch: - + Unable to test-launch Syncthing: - + Built-in Syncthing available: - + yes - + no - + Launcher: - + Details from setup detection - diff --git a/widgets/translations/syncthingwidgets_de_DE.ts b/widgets/translations/syncthingwidgets_de_DE.ts index 4f553b6..a303387 100644 --- a/widgets/translations/syncthingwidgets_de_DE.ts +++ b/widgets/translations/syncthingwidgets_de_DE.ts @@ -258,127 +258,127 @@ Allgemein - + Apply Anwenden - + Apply selected configuration Ausgewählte Konfiguration anwenden - + Review the summary of the configuration changes before applying them Überprüfe die Zusammenfassung der Konfigurationsänderungen vor dem Anwenden - + Summary: Zusammenfassung: - + Keep %1 %2 Lasse %1 %2 - + enabled aktiviert - + disabled deaktiviert - + %1 %2 %1 %2 - + Enable Aktiviere - + Disable Deaktiviere - + Keeping connection and launcher configuration as-is Behalte vorhandene Verbindungs- und Startereinstellungen - + Configure Syncthing Tray to use the currently running Syncthing instance Konfiguriere Syncthing Tray die aktuell laufende Syncthing-Instanz zu verwenden - + Do <i>not</i> change how Syncthing is launched Verändere <i>nicht</i> wie Syncthing gestartet wird - + Start Syncthing via Syncthing Tray's launcher Starte Syncthing mit Syncthing Tray's Starter - + executable from PATH as separate process, "%1" führe die Syncthing-Binary vom PATH als externen Prozess aus, "%1" - + built-in Syncthing library, "%1" verwende eingebaute Syncthing-Bibliothek, "%1" - + Start Syncthing by enabling and starting its systemd unit Starte Syncthing durch Aktivieren und Starten der systemd-Unit - + Using user unit "%1" Verwende Benutzer-Unit "%1" - + Using system unit "%1" Verwende System-Unit "%1" - + systemd integration systemd-Integration - + autostart of Syncthing Tray Autostart von Syncthing Tray - + Further information: Weitere Informationen: - + Click on "Show details from setup detection" for further details. Klicke auf "Zeige Details der Einrichtungserkennung" für weitere Details. - + If you want to do amendments, you can head back one or more steps. Wenn du Änderungen vornehmen willst, kannst du einen order mehrere Schritte zurück gehen. - + If you abort now, nothing will be changed. Wenn du jetzt abbrichst, werden keine Änderungen vorgenommen. @@ -449,12 +449,12 @@ Weil Syncthing auf deinem System unabhängig von der Tray-Anwendung gestartet wird, betrifft diese Einstellung nur das Tray-Icon, aber <i>nicht</i> Syncthing selbst. - + Configure autostart Konfiguriere den Autostart - + Select whether to start Syncthing Tray automatically Wähle, ob Syncthing Tray automatisch gestartet werden soll @@ -717,7 +717,7 @@ QtGui::DetectionWizardPage - + Checking current Syncthing setup Prüfe das aktuelle Syncthing-Setup @@ -726,27 +726,42 @@ Initialisierung … - + Checking Syncthing configuration and whether Syncthing is already running or can be started … Suche die Syncthing-Konfiguration und prüfe ob Syncthing bereits läuft oder gestartet werden kann … - + It looks like Syncthing has not been running on this system before as its configuration cannot be found. Is that correct? Es sieht so aus als wurde Syncthing auf dem System noch nicht ausgeführt, da die Syncthing-Konfiguration nicht gefunden werden konnte. Ist das richtig? - + Yes, continue configuration Ja, mache weiter mit der Konfiguration + + + Check again + Syncthing-Setup nochmals prüfen + + Re-visit setup detection + Das Syncthing-Setup erneut überprüfen + + + + You might trigger checking the Syncthing setup again + Du kannst das aktuelle Syncthing-Setup erneut überprüfen + + + No, let me select Syncthing's configuration file manually Nein, Pfad der Syncthing-Konfiguration manuell wählen - + Select Syncthing's configuration file Wähle die Syncthing-Konfigurationsdatei @@ -794,37 +809,37 @@ QtGui::FinalWizardPage - + Waiting for configuration wizard completed Warte bis die Konfiguration abgeschlossen wurde - + Changes are being applied Änderungen werden angewendet - + Configuration wizard completed Der Konfigurationsassistent wurde abgeschlossen - + All changes have been applied Alle Änderungen wurden angewendet - + The configuration has been changed successfully. You can close the wizard and <a href="openSyncthing">open Syncthing</a> to pair remote devices and add folders for sharing. If you need further help, read the <a href="openDocs">documentation to get started</a>. Die Konfiguration wurde erfolgreich geändert. Du kannst den Assistenten jetzt schließen und <a href="openSyncthing">Syncthing öffnen</a>, um entfernte Geräte hinzuzufügen und Verzeichnisse zu teilen. Für weitere Hilfe, lese die <a href="openDocs">Dokumentation für die Einrichtung von Syncthing</a>. - + Not all changes could be applied Nicht alle Änderungen konnten angewendet werden - + You may try to head back one or more steps and try again or finish the wizard and configure Syncthing Tray manually. Du kannst einen oder mehrere Schritte zurück gehen, um es noch einmal zu versuchen. Alternativ kannst du den Assistenten auch schließen und Syncthing Tray manuell konfigurieren. @@ -1195,37 +1210,37 @@ QtGui::MainConfigWizardPage - + Select what configuration to apply Wähle, welche Einstellungen angewendet werden sollen - + Something when wrong when checking the Syncthing setup. Etwas ist beim Erkennen des Syncthing-Setups schiefgelaufen. - + Show details from setup detection Zeige Details der Einrichtungserkennung - + Systemd - + <b>The Syncthing config could be located under "%1" but it seems invalid/incomplete.</b> Hence Syncthing is assumed to be not running. <b>Die Syncthing-Konfiguration konnte unter "%1" gefunden werden, aber scheint ungültig/unvollständig zu sein.</b> Daher wird angenommen, dass Syncthing nicht läuft. - + Looks like Syncthing is not running yet. You can launch it via %1. Syncthing läuft noch nicht. Es kann mit %1 gestartet werden. - + and und @@ -1274,17 +1289,17 @@ nicht neu verbinden - + Looks like Syncthing is already running and Syncthing Tray can be configured accordingly automatically. Es sieht so aus, als würde Syncthing bereits laufen. Syncthing Tray kann automatisch konfiguriert werden, die laufende Syncthing-Instanz zu verwenden. - + Syncthing Tray's launcher Syncthing-Tray's Starter - + Looks like Syncthing is not running yet and needs to be installed before Syncthing Tray can be configured. Es sieht so aus, als würde Syncthing noch nicht laufen. Syncthing muss erst installiert werden, bevor Syncthing Tray konfiguriert werden kann. @@ -1774,12 +1789,12 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.Es sieht so aus, als würdes du %1 zum erstem Mal starten. - + Welcome to Syncthing Tray Willkommen zu Syncthing Tray - + It looks like you're launching Syncthing Tray for the first time. Es sieht so aus, als würdes du Syncthing Tray zum erstem Mal starten. @@ -1788,57 +1803,57 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.Vor der ersten Verwendung muss eingestellt werden, wie sich Syncthing Tray mit Syncthing verbinden soll und wie Syncthing gestartet werden soll (wenn gewünscht). Eine geführte/automatische Einrichtung ist noch in Arbeit, weshalb die manuelle Konfiguration im Moment die einzige Option ist. - + You must configure how to connect to Syncthing and how to launch Syncthing (if that's wanted) when using Syncthing Tray the first time. Vor der ersten Verwendung muss eingestellt werden, wie sich Syncthing Tray mit Syncthing verbinden soll und wie Syncthing gestartet werden soll (wenn gewünscht). - + Wizard's start page Startseite des Assistenten - + This wizard will help you configuring Syncthing Tray. Dieser Assistent kann helfen Syncthing Tray zu konfigurieren. - + Start guided setup Starte geführte Einrichtung - + Allows to configure Syncthing Tray automatically for the local Syncthing instance and helps you starting Syncthing if wanted. Ermöglicht es, Syncthing Tray automatisch für die lokale Syncthing-Instanz zu konfigurieren und Syncthing zu starten (wenn gewünscht). - + Configure connection and launcher settings manually Konfiguriere die Verbindungs- und Startereinstellungen manuell - + Head back to settings to configure connection and launcher manually Kehre zurück zum Einstellungs-Dialog, um die Verbindung und den Starter manuell zu konfigurieren - + Note that the connection settings allow importing URL, credentials and API-key from the local Syncthing configuration. Die Verbindungseinstellungen erlauben es die URL, Zugangsdaten und den API-Schlüssel der lokalen Instanz zu importieren. - + Show Syncthing's documentation Öffne die Syncthing-Dokumentation - + It contains general information about configuring Syncthing. Die Syncthing-Dokumentation enthält allgemeine Informationen über die Konfiguration von Syncthing. - + Show Syncthing Tray's README Öffne die RREADME von Syncthing Tray @@ -1847,7 +1862,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.Öffne die RREADME von %1 - + It contains documentation about this GUI integration specifically. Die README ist die Dokumentation für diese GUI-Integration. @@ -1855,102 +1870,102 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet. QtGui::Wizard - + Setup wizard - Einrichtungsassistent - - + The internal launcher has not been initialized. Der Starter wurde nicht initialisiert. - + The service handler has not been initialized. Das Service-Management wurde nicht initialisiert. - + Unable to locate Syncthing config file. Die Syncthing-Konfigurationsdatei konnte nicht gefunden werden. - + Located Syncthing config file: Gefundene Syncthing-Konfigurationsdatei: - + Syncthing config file looks ok. Die Syncthing-Konfigurationsdatei sieht in Ordnung aus. - + Syncthing config file looks invalid/incomplete. Die Syncthing-Konfigurationsdatei sieht ungültig/unvollständig aus. - + Syncthing configuration: Syncthing-Konfiguration: - + Could connect to Syncthing under: Verbindung mit Syncthing konnte hergestellt werden unter: - + Syncthing version: Syncthing-Version: - + Syncthing device ID: Syncthing-Geräte-ID: - + Syncthing status: Syncthing-Status: - + Additional Syncthing status info: Zusätzliche Syncthing-Status-Information: - + Autostart: Auto-Start: - + Currently %1 Aktuell %1 - + enabled aktiviert - + disabled deaktiviert - + The Syncthing process exited prematurely. Der Syncthing-Prozess hat sich vorzeitig beendet. - + The Syncthing service stopped prematurely. Der Syncthing-Dienst has sich vorzeitig beendet. - + Ran into timeout while waiting for Syncthing to create config file. Maybe Syncthing created its config file under an unexpected location. Die Wartezeit, dass Syncthing eine Konfigurationsdatei anlegt, wurde überschritten. Vielleichtg hat Syncthing die Konfigurationsdatei an einem unerwarteten Ort angelegt. @@ -1959,92 +1974,92 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.Die Wartezeit, dass Syncthing eine Konfigurationsdatei anlegt, wurde überschritten. Vielleichtg hat Syncthing die Konfigurationsdatei an einem unerwarteten Ort angelegt. - + Checkout Syncthing's log for details. Schaue in den Syncthing-Log für Details. - + It can be accessed within the <a href="openLauncherSettings">launcher settings</a>. Auf den Syncthing-Log kann über die <a href="openLauncherSettings">Starter-Einstellungen</a> zugegriffen werden. - + It is normally written to the system journal (and can be accessed via e.g. journalctl). Der Syncthing-Log wird normalerweise in das System-Journal geschrieben (auf das z. B. mittels "journalctl" zugegriffen werden kann). - + API connection: API-Verbindung: - + API connection errors: API-Verbindungsfehler: - + State of user unit file "%1": Status der Benutzer-Unit-Datei "%1": - + State of system unit file "%1": Status der System-Unit-Datei "%1": - + Systemd: Systemd: - + Could NOT connect to Syncthing under: Konnte sich NICHT mit Syncthing verbinden unter: - + No available Nicht verfügbar - + Could test-launch Syncthing successfully, exit code: Konnte Syncthing erfolgreich zum Test starten, Exit-Code: - + Syncthing version returned from test-launch: Syncthing-Version, die vom Test-Start zurückgegeben wurde: - + Unable to test-launch Syncthing: Kann Syncthing nicht test-starten: - + Built-in Syncthing available: Eingebaute Syncthing-Bibliothek ist verfügbar: - + yes ja - + no nein - + Launcher: Starter: - + Details from setup detection - Details der Einrichtungserkennung diff --git a/widgets/translations/syncthingwidgets_en_US.ts b/widgets/translations/syncthingwidgets_en_US.ts index 68b0612..7fc5c05 100644 --- a/widgets/translations/syncthingwidgets_en_US.ts +++ b/widgets/translations/syncthingwidgets_en_US.ts @@ -163,127 +163,127 @@ - + Apply - + Apply selected configuration - + Review the summary of the configuration changes before applying them - + Summary: - + Keep %1 %2 - + enabled - + disabled - + %1 %2 - + Enable - + Disable - + Keeping connection and launcher configuration as-is - + Configure Syncthing Tray to use the currently running Syncthing instance - + Do <i>not</i> change how Syncthing is launched - + Start Syncthing via Syncthing Tray's launcher - + executable from PATH as separate process, "%1" - + built-in Syncthing library, "%1" - + Start Syncthing by enabling and starting its systemd unit - + Using user unit "%1" - + Using system unit "%1" - + systemd integration - + autostart of Syncthing Tray - + Further information: - + Click on "Show details from setup detection" for further details. - + If you want to do amendments, you can head back one or more steps. - + If you abort now, nothing will be changed. @@ -354,12 +354,12 @@ - + Configure autostart - + Select whether to start Syncthing Tray automatically @@ -622,32 +622,47 @@ QtGui::DetectionWizardPage - + Checking current Syncthing setup - + Checking Syncthing configuration and whether Syncthing is already running or can be started … - - It looks like Syncthing has not been running on this system before as its configuration cannot be found. Is that correct? - - - - - Yes, continue configuration + + Check again + Re-visit setup detection + + + + + You might trigger checking the Syncthing setup again + + + + + It looks like Syncthing has not been running on this system before as its configuration cannot be found. Is that correct? + + + + + Yes, continue configuration + + + + No, let me select Syncthing's configuration file manually - + Select Syncthing's configuration file @@ -691,37 +706,37 @@ QtGui::FinalWizardPage - + Waiting for configuration wizard completed - + Changes are being applied - + Configuration wizard completed - + All changes have been applied - + The configuration has been changed successfully. You can close the wizard and <a href="openSyncthing">open Syncthing</a> to pair remote devices and add folders for sharing. If you need further help, read the <a href="openDocs">documentation to get started</a>. - + Not all changes could be applied - + You may try to head back one or more steps and try again or finish the wizard and configure Syncthing Tray manually. @@ -1058,37 +1073,37 @@ QtGui::MainConfigWizardPage - + Select what configuration to apply - + Something when wrong when checking the Syncthing setup. - + Show details from setup detection - + Systemd - + <b>The Syncthing config could be located under "%1" but it seems invalid/incomplete.</b> Hence Syncthing is assumed to be not running. - + Looks like Syncthing is not running yet. You can launch it via %1. - + and @@ -1133,17 +1148,17 @@ - + Looks like Syncthing is already running and Syncthing Tray can be configured accordingly automatically. - + Syncthing Tray's launcher - + Looks like Syncthing is not running yet and needs to be installed before Syncthing Tray can be configured. @@ -1591,72 +1606,72 @@ The Web UI will be opened in the default web browser instead. QtGui::WelcomeWizardPage - + Welcome to Syncthing Tray - + It looks like you're launching Syncthing Tray for the first time. - + You must configure how to connect to Syncthing and how to launch Syncthing (if that's wanted) when using Syncthing Tray the first time. - + Wizard's start page - + This wizard will help you configuring Syncthing Tray. - + Start guided setup - + Allows to configure Syncthing Tray automatically for the local Syncthing instance and helps you starting Syncthing if wanted. - + Configure connection and launcher settings manually - + Head back to settings to configure connection and launcher manually - + Note that the connection settings allow importing URL, credentials and API-key from the local Syncthing configuration. - + Show Syncthing's documentation - + It contains general information about configuring Syncthing. - + Show Syncthing Tray's README - + It contains documentation about this GUI integration specifically. @@ -1664,192 +1679,192 @@ The Web UI will be opened in the default web browser instead. QtGui::Wizard - + Setup wizard - - + The internal launcher has not been initialized. - + The service handler has not been initialized. - + Unable to locate Syncthing config file. - + Located Syncthing config file: - + Syncthing config file looks ok. - + Syncthing config file looks invalid/incomplete. - + Syncthing configuration: - + Could connect to Syncthing under: - + Syncthing version: - + Syncthing device ID: - + Syncthing status: - + Additional Syncthing status info: - + Autostart: - + Currently %1 - + enabled - + disabled - + The Syncthing process exited prematurely. - + The Syncthing service stopped prematurely. - + Ran into timeout while waiting for Syncthing to create config file. Maybe Syncthing created its config file under an unexpected location. - + Checkout Syncthing's log for details. - + It can be accessed within the <a href="openLauncherSettings">launcher settings</a>. - + It is normally written to the system journal (and can be accessed via e.g. journalctl). - + API connection: - + API connection errors: - + State of user unit file "%1": - + State of system unit file "%1": - + Systemd: - + Could NOT connect to Syncthing under: - + No available - + Could test-launch Syncthing successfully, exit code: - + Syncthing version returned from test-launch: - + Unable to test-launch Syncthing: - + Built-in Syncthing available: - + yes - + no - + Launcher: - + Details from setup detection - diff --git a/widgets/translations/syncthingwidgets_zh_CN.ts b/widgets/translations/syncthingwidgets_zh_CN.ts index 924c86a..11392a5 100644 --- a/widgets/translations/syncthingwidgets_zh_CN.ts +++ b/widgets/translations/syncthingwidgets_zh_CN.ts @@ -171,127 +171,127 @@ 一般 - + Apply - + Apply selected configuration - + Review the summary of the configuration changes before applying them - + Summary: - + Keep %1 %2 - + enabled - + disabled - + %1 %2 - + Enable 启用 - + Disable 禁用 - + Keeping connection and launcher configuration as-is - + Configure Syncthing Tray to use the currently running Syncthing instance - + Do <i>not</i> change how Syncthing is launched - + Start Syncthing via Syncthing Tray's launcher - + executable from PATH as separate process, "%1" - + built-in Syncthing library, "%1" - + Start Syncthing by enabling and starting its systemd unit - + Using user unit "%1" - + Using system unit "%1" - + systemd integration - + autostart of Syncthing Tray - + Further information: - + Click on "Show details from setup detection" for further details. - + If you want to do amendments, you can head back one or more steps. - + If you abort now, nothing will be changed. @@ -362,12 +362,12 @@ - + Configure autostart - + Select whether to start Syncthing Tray automatically @@ -630,32 +630,47 @@ QtGui::DetectionWizardPage - + Checking current Syncthing setup - + Checking Syncthing configuration and whether Syncthing is already running or can be started … - - It looks like Syncthing has not been running on this system before as its configuration cannot be found. Is that correct? - - - - - Yes, continue configuration + + Check again + Re-visit setup detection + + + + + You might trigger checking the Syncthing setup again + + + + + It looks like Syncthing has not been running on this system before as its configuration cannot be found. Is that correct? + + + + + Yes, continue configuration + + + + No, let me select Syncthing's configuration file manually - + Select Syncthing's configuration file @@ -702,37 +717,37 @@ QtGui::FinalWizardPage - + Waiting for configuration wizard completed - + Changes are being applied - + Configuration wizard completed - + All changes have been applied - + The configuration has been changed successfully. You can close the wizard and <a href="openSyncthing">open Syncthing</a> to pair remote devices and add folders for sharing. If you need further help, read the <a href="openDocs">documentation to get started</a>. - + Not all changes could be applied - + You may try to head back one or more steps and try again or finish the wizard and configure Syncthing Tray manually. @@ -1076,37 +1091,37 @@ QtGui::MainConfigWizardPage - + Select what configuration to apply - + Something when wrong when checking the Syncthing setup. - + Show details from setup detection - + Systemd Systemd - + <b>The Syncthing config could be located under "%1" but it seems invalid/incomplete.</b> Hence Syncthing is assumed to be not running. - + Looks like Syncthing is not running yet. You can launch it via %1. - + and @@ -1155,17 +1170,17 @@ 否 - + Looks like Syncthing is already running and Syncthing Tray can be configured accordingly automatically. - + Syncthing Tray's launcher - + Looks like Syncthing is not running yet and needs to be installed before Syncthing Tray can be configured. @@ -1636,72 +1651,72 @@ The Web UI will be opened in the default web browser instead. QtGui::WelcomeWizardPage - + Welcome to Syncthing Tray - + It looks like you're launching Syncthing Tray for the first time. - + You must configure how to connect to Syncthing and how to launch Syncthing (if that's wanted) when using Syncthing Tray the first time. - + Wizard's start page - + This wizard will help you configuring Syncthing Tray. - + Start guided setup - + Allows to configure Syncthing Tray automatically for the local Syncthing instance and helps you starting Syncthing if wanted. - + Configure connection and launcher settings manually - + Head back to settings to configure connection and launcher manually - + Note that the connection settings allow importing URL, credentials and API-key from the local Syncthing configuration. - + Show Syncthing's documentation - + It contains general information about configuring Syncthing. - + Show Syncthing Tray's README - + It contains documentation about this GUI integration specifically. @@ -1709,192 +1724,192 @@ The Web UI will be opened in the default web browser instead. QtGui::Wizard - + Setup wizard - - + The internal launcher has not been initialized. - + The service handler has not been initialized. - + Unable to locate Syncthing config file. - + Located Syncthing config file: - + Syncthing config file looks ok. - + Syncthing config file looks invalid/incomplete. - + Syncthing configuration: - + Could connect to Syncthing under: - + Syncthing version: - + Syncthing device ID: - + Syncthing status: - + Additional Syncthing status info: - + Autostart: - + Currently %1 - + enabled - + disabled - + The Syncthing process exited prematurely. - + The Syncthing service stopped prematurely. - + Ran into timeout while waiting for Syncthing to create config file. Maybe Syncthing created its config file under an unexpected location. - + Checkout Syncthing's log for details. - + It can be accessed within the <a href="openLauncherSettings">launcher settings</a>. - + It is normally written to the system journal (and can be accessed via e.g. journalctl). - + API connection: - + API connection errors: - + State of user unit file "%1": - + State of system unit file "%1": - + Systemd: - + Could NOT connect to Syncthing under: - + No available - + Could test-launch Syncthing successfully, exit code: - + Syncthing version returned from test-launch: - + Unable to test-launch Syncthing: - + Built-in Syncthing available: - + yes - + no 否 - + Launcher: - + Details from setup detection -