Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename "Inotify-launcher" to "Extra launcher" 

The external inotify tool is likely not used anymore. It makes sense to
keep the concept of supporting additional tools because it might be used
in the future again. So it seems best to give the additional launcher a
more generic name.
This commit is contained in:
Martchus 2020-07-09 21:08:46 +02:00
parent b5cf0523b6
commit e10eca68f9
5 changed files with 138 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widgets/settings/settingsdialog.cpp
View File

@ -851,7 +851,7 @@ LauncherOptionPage::LauncherOptionPage(QWidget *parentWidget)
{ {
} }
LauncherOptionPage::LauncherOptionPage(const QString &tool, QWidget *parentWidget) LauncherOptionPage::LauncherOptionPage(const QString &tool, const QString &toolName, const QString &windowTitle, QWidget *parentWidget)
: QObject(parentWidget) : QObject(parentWidget)
, LauncherOptionPageBase(parentWidget) , LauncherOptionPageBase(parentWidget)
, m_process(&Launcher::toolProcess(tool)) , m_process(&Launcher::toolProcess(tool))
@ -859,6 +859,8 @@ LauncherOptionPage::LauncherOptionPage(const QString &tool, QWidget *parentWidge
, m_restoreArgsAction(nullptr) , m_restoreArgsAction(nullptr)
, m_kill(false) , m_kill(false)
, m_tool(tool) , m_tool(tool)
, m_toolName(toolName)
, m_windowTitle(windowTitle)
{ {
} }
@ -873,10 +875,12 @@ QWidget *LauncherOptionPage::setupWidget()
// adjust labels to use name of additional tool instead of "Syncthing" // adjust labels to use name of additional tool instead of "Syncthing"
const auto isSyncthing = m_tool.isEmpty(); const auto isSyncthing = m_tool.isEmpty();
if (!isSyncthing) { if (!isSyncthing) {
widget->setWindowTitle(tr("%1-launcher").arg(m_tool)); widget->setWindowTitle(m_windowTitle.isEmpty() ? tr("%1-launcher").arg(m_tool) : m_windowTitle);
ui()->enabledCheckBox->setText(tr("Launch %1 when starting the tray icon").arg(m_tool)); ui()->enabledCheckBox->setText(tr("Launch %1 when starting the tray icon").arg(m_toolName.isEmpty() ? m_tool : m_toolName));
ui()->syncthingPathLabel->setText(tr("%1 executable").arg(m_tool)); auto toolNameStartingSentence = m_toolName.isEmpty() ? m_tool : m_toolName;
ui()->logLabel->setText(tr("%1 log (interleaved stdout/stderr)").arg(m_tool)); toolNameStartingSentence[0] = toolNameStartingSentence[0].toUpper();
ui()->syncthingPathLabel->setText(tr("%1 executable").arg(toolNameStartingSentence));
ui()->logLabel->setText(tr("%1 log (interleaved stdout/stderr)").arg(toolNameStartingSentence));
// hide "consider for reconnect" and "show start/stop button on tray" checkboxes for tools // hide "consider for reconnect" and "show start/stop button on tray" checkboxes for tools
ui()->considerForReconnectCheckBox->setVisible(false); ui()->considerForReconnectCheckBox->setVisible(false);
@ -1341,9 +1345,10 @@ SettingsDialog::SettingsDialog(Data::SyncthingConnection *connection, QWidget *p
category = new OptionCategory(this); category = new OptionCategory(this);
category->setDisplayName(tr("Startup")); category->setDisplayName(tr("Startup"));
category->assignPages({ new AutostartOptionPage, new LauncherOptionPage, new LauncherOptionPage(QStringLiteral("Inotify")) category->assignPages({ new AutostartOptionPage, new LauncherOptionPage,
new LauncherOptionPage(QStringLiteral("Inotify"), tr("additional tool"), tr("Extra launcher"))
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
, ,
new SystemdOptionPage new SystemdOptionPage
#endif #endif
}); });

5
widgets/settings/settingsdialog.h
View File

@ -105,7 +105,8 @@ class QT_UTILITIES_EXPORT LauncherOptionPage : public QObject, public ::QtUtilit
public: public:
LauncherOptionPage(QWidget *parentWidget = nullptr); LauncherOptionPage(QWidget *parentWidget = nullptr);
LauncherOptionPage(const QString &tool, QWidget *parentWidget = nullptr); LauncherOptionPage(
const QString &tool, const QString &toolName = QString(), const QString &windowTitle = QString(), QWidget *parentWidget = nullptr);
~LauncherOptionPage() override; ~LauncherOptionPage() override;
bool apply() override; bool apply() override;
void reset() override; void reset() override;
@ -129,7 +130,7 @@ private:
Data::SyncthingLauncher *const m_launcher; Data::SyncthingLauncher *const m_launcher;
QAction *m_restoreArgsAction; QAction *m_restoreArgsAction;
bool m_kill; bool m_kill;
QString m_tool; QString m_tool, m_toolName, m_windowTitle;
}; };
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD

66
widgets/translations/syncthingwidgets_cs_CZ.ts
View File

@ -684,7 +684,7 @@
</message> </message>
<message> <message>
<location filename="../settings/launcheroptionpage.ui" line="193"/> <location filename="../settings/launcheroptionpage.ui" line="193"/>
<location filename="../settings/settingsdialog.cpp" line="983"/> <location filename="../settings/settingsdialog.cpp" line="993"/>
<source>Stop launched instance</source> <source>Stop launched instance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -699,77 +699,77 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="876"/> <location filename="../settings/settingsdialog.cpp" line="878"/>
<source>%1-launcher</source> <source>%1-launcher</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="877"/> <location filename="../settings/settingsdialog.cpp" line="879"/>
<source>Launch %1 when starting the tray icon</source> <source>Launch %1 when starting the tray icon</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="878"/> <location filename="../settings/settingsdialog.cpp" line="882"/>
<source>%1 executable</source> <source>%1 executable</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="879"/> <location filename="../settings/settingsdialog.cpp" line="883"/>
<source>%1 log (interleaved stdout/stderr)</source> <source>%1 log (interleaved stdout/stderr)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="891"/> <location filename="../settings/settingsdialog.cpp" line="899"/>
<source>Restore default</source> <source>Restore default</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1018"/> <location filename="../settings/settingsdialog.cpp" line="1028"/>
<source>%1 exited with exit code %2</source> <source>%1 exited with exit code %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1021"/> <location filename="../settings/settingsdialog.cpp" line="1031"/>
<source>%1 crashed with exit code %2</source> <source>%1 crashed with exit code %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1048"/> <location filename="../settings/settingsdialog.cpp" line="1058"/>
<source>failed to start (e.g. executable does not exist or not permission error)</source> <source>failed to start (e.g. executable does not exist or not permission error)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1051"/> <location filename="../settings/settingsdialog.cpp" line="1061"/>
<source>process crashed</source> <source>process crashed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1054"/> <location filename="../settings/settingsdialog.cpp" line="1064"/>
<source>timeout error</source> <source>timeout error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1057"/> <location filename="../settings/settingsdialog.cpp" line="1067"/>
<source>read error</source> <source>read error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1060"/> <location filename="../settings/settingsdialog.cpp" line="1070"/>
<source>write error</source> <source>write error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1063"/> <location filename="../settings/settingsdialog.cpp" line="1073"/>
<source>unknown process error</source> <source>unknown process error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1065"/> <location filename="../settings/settingsdialog.cpp" line="1075"/>
<source>An error occurred when running %1: %2</source> <source>An error occurred when running %1: %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1116"/> <location filename="../settings/settingsdialog.cpp" line="1126"/>
<source>Kill launched instance</source> <source>Kill launched instance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -888,22 +888,32 @@
<context> <context>
<name>QtGui::SettingsDialog</name> <name>QtGui::SettingsDialog</name>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1323"/> <location filename="../settings/settingsdialog.cpp" line="1333"/>
<source>Tray</source> <source>Tray</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1330"/> <location filename="../settings/settingsdialog.cpp" line="1340"/>
<source>Web view</source> <source>Web view</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1337"/> <location filename="../settings/settingsdialog.cpp" line="1347"/>
<source>Startup</source> <source>Startup</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1359"/> <location filename="../settings/settingsdialog.cpp" line="1349"/>
<source>Extra launcher</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1349"/>
<source>additional tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1370"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1063,8 +1073,8 @@ This dialog closes automatically when the process finally terminates.</source>
<location filename="../settings/systemdoptionpage.ui" line="106"/> <location filename="../settings/systemdoptionpage.ui" line="106"/>
<location filename="../settings/systemdoptionpage.ui" line="161"/> <location filename="../settings/systemdoptionpage.ui" line="161"/>
<location filename="../settings/systemdoptionpage.ui" line="250"/> <location filename="../settings/systemdoptionpage.ui" line="250"/>
<location filename="../settings/settingsdialog.cpp" line="1238"/> <location filename="../settings/settingsdialog.cpp" line="1248"/>
<location filename="../settings/settingsdialog.cpp" line="1250"/> <location filename="../settings/settingsdialog.cpp" line="1260"/>
<source>unknown</source> <source>unknown</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1104,22 +1114,22 @@ This dialog closes automatically when the process finally terminates.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1174"/> <location filename="../settings/settingsdialog.cpp" line="1184"/>
<source>It is not possible to show the start/stop button for the systemd service and the internal launcher at the same time. The systemd service precedes.</source> <source>It is not possible to show the start/stop button for the systemd service and the internal launcher at the same time. The systemd service precedes.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1180"/> <location filename="../settings/settingsdialog.cpp" line="1190"/>
<source>It is not possible to consider the systemd service and the internal launcher for reconnects at the same time. The systemd service precedes.</source> <source>It is not possible to consider the systemd service and the internal launcher for reconnects at the same time. The systemd service precedes.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1211"/> <location filename="../settings/settingsdialog.cpp" line="1221"/>
<source>specified unit is either inactive or doesn&apos;t exist</source> <source>specified unit is either inactive or doesn&apos;t exist</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1233"/> <location filename="../settings/settingsdialog.cpp" line="1243"/>
<source>since </source> <source>since </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1153,7 +1163,7 @@ This dialog closes automatically when the process finally terminates.</source>
<name>QtGui::WebViewOptionPage</name> <name>QtGui::WebViewOptionPage</name>
<message> <message>
<location filename="../settings/webviewoptionpage.ui" line="12"/> <location filename="../settings/webviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1272"/> <location filename="../settings/settingsdialog.cpp" line="1282"/>
<source>General</source> <source>General</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1183,7 +1193,7 @@ This dialog closes automatically when the process finally terminates.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1274"/> <location filename="../settings/settingsdialog.cpp" line="1284"/>
<source>Syncthing Tray has not been built with vieb view support utilizing either Qt WebKit or Qt WebEngine. <source>Syncthing Tray has not been built with vieb view support utilizing either Qt WebKit or Qt WebEngine.
The Web UI will be opened in the default web browser instead.</source> The Web UI will be opened in the default web browser instead.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

76
widgets/translations/syncthingwidgets_de_DE.ts
View File

@ -684,7 +684,7 @@
</message> </message>
<message> <message>
<location filename="../settings/launcheroptionpage.ui" line="193"/> <location filename="../settings/launcheroptionpage.ui" line="193"/>
<location filename="../settings/settingsdialog.cpp" line="983"/> <location filename="../settings/settingsdialog.cpp" line="993"/>
<source>Stop launched instance</source> <source>Stop launched instance</source>
<translation>Stoppen</translation> <translation>Stoppen</translation>
</message> </message>
@ -699,77 +699,81 @@
<translation>Log folgen</translation> <translation>Log folgen</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="876"/> <location filename="../settings/settingsdialog.cpp" line="878"/>
<source>%1-launcher</source> <source>%1-launcher</source>
<translation>%1-Starter</translation> <translation>%1-Starter</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="877"/> <location filename="../settings/settingsdialog.cpp" line="879"/>
<source>Launch %1 when starting the tray icon</source> <source>Launch %1 when starting the tray icon</source>
<translation>Starte %1 beim Starten des Tray-Icons</translation> <translation>Starte %1 beim Starten des Tray-Icons</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="878"/> <source>%1 launcher</source>
<translation type="obsolete">%1-Starter {1 ?}</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="882"/>
<source>%1 executable</source> <source>%1 executable</source>
<translation>Ausführbare Datei von %1</translation> <translation>Ausführbare Datei von %1</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="879"/> <location filename="../settings/settingsdialog.cpp" line="883"/>
<source>%1 log (interleaved stdout/stderr)</source> <source>%1 log (interleaved stdout/stderr)</source>
<translation>%1-Log (stdout/stderr)</translation> <translation>Log von %1 (stdout/stderr)</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="891"/> <location filename="../settings/settingsdialog.cpp" line="899"/>
<source>Restore default</source> <source>Restore default</source>
<translation>Auf Vorgabe zurücksetzen</translation> <translation>Auf Vorgabe zurücksetzen</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1018"/> <location filename="../settings/settingsdialog.cpp" line="1028"/>
<source>%1 exited with exit code %2</source> <source>%1 exited with exit code %2</source>
<translation>%1 wurde mit dem Statuscode %2 beendet</translation> <translation>%1 wurde mit dem Statuscode %2 beendet</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1021"/> <location filename="../settings/settingsdialog.cpp" line="1031"/>
<source>%1 crashed with exit code %2</source> <source>%1 crashed with exit code %2</source>
<translation>%1 ist mit dem Statuscode %2 abgestürzt</translation> <translation>%1 ist mit dem Statuscode %2 abgestürzt</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1048"/> <location filename="../settings/settingsdialog.cpp" line="1058"/>
<source>failed to start (e.g. executable does not exist or not permission error)</source> <source>failed to start (e.g. executable does not exist or not permission error)</source>
<translation>Start fehlgeschlagen (z. B. weil Programmdatei nicht existiert oder nicht ausführbar ist)</translation> <translation>Start fehlgeschlagen (z. B. weil Programmdatei nicht existiert oder nicht ausführbar ist)</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1051"/> <location filename="../settings/settingsdialog.cpp" line="1061"/>
<source>process crashed</source> <source>process crashed</source>
<translation>Prozess ist abgestürzt</translation> <translation>Prozess ist abgestürzt</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1054"/> <location filename="../settings/settingsdialog.cpp" line="1064"/>
<source>timeout error</source> <source>timeout error</source>
<translation>Time-out</translation> <translation>Time-out</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1057"/> <location filename="../settings/settingsdialog.cpp" line="1067"/>
<source>read error</source> <source>read error</source>
<translation>Lesefehler</translation> <translation>Lesefehler</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1060"/> <location filename="../settings/settingsdialog.cpp" line="1070"/>
<source>write error</source> <source>write error</source>
<translation>Schreibfehler</translation> <translation>Schreibfehler</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1063"/> <location filename="../settings/settingsdialog.cpp" line="1073"/>
<source>unknown process error</source> <source>unknown process error</source>
<translation>unbekannter Fehler</translation> <translation>unbekannter Fehler</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1065"/> <location filename="../settings/settingsdialog.cpp" line="1075"/>
<source>An error occurred when running %1: %2</source> <source>An error occurred when running %1: %2</source>
<translation>Beim Ausführen von %1 ist ein Fehler aufgetreten: %2</translation> <translation>Beim Ausführen von %1 ist ein Fehler aufgetreten: %2</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1116"/> <location filename="../settings/settingsdialog.cpp" line="1126"/>
<source>Kill launched instance</source> <source>Kill launched instance</source>
<translation>Töten</translation> <translation>Töten</translation>
</message> </message>
@ -888,22 +892,36 @@
<context> <context>
<name>QtGui::SettingsDialog</name> <name>QtGui::SettingsDialog</name>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1323"/> <location filename="../settings/settingsdialog.cpp" line="1333"/>
<source>Tray</source> <source>Tray</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1330"/> <location filename="../settings/settingsdialog.cpp" line="1340"/>
<source>Web view</source> <source>Web view</source>
<translation>Weboberfläche</translation> <translation>Weboberfläche</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1337"/> <location filename="../settings/settingsdialog.cpp" line="1347"/>
<source>Startup</source> <source>Startup</source>
<translation>Starten</translation> <translation>Starten</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1359"/> <source>Additional tool</source>
<translation type="vanished">Zusatztool</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1349"/>
<source>Extra launcher</source>
<translation>Extra-Starter</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1349"/>
<source>additional tool</source>
<translation>Zusatztool</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1370"/>
<source>Settings</source> <source>Settings</source>
<translation>Einstellungen</translation> <translation>Einstellungen</translation>
</message> </message>
@ -1069,8 +1087,8 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<location filename="../settings/systemdoptionpage.ui" line="106"/> <location filename="../settings/systemdoptionpage.ui" line="106"/>
<location filename="../settings/systemdoptionpage.ui" line="161"/> <location filename="../settings/systemdoptionpage.ui" line="161"/>
<location filename="../settings/systemdoptionpage.ui" line="250"/> <location filename="../settings/systemdoptionpage.ui" line="250"/>
<location filename="../settings/settingsdialog.cpp" line="1238"/> <location filename="../settings/settingsdialog.cpp" line="1248"/>
<location filename="../settings/settingsdialog.cpp" line="1250"/> <location filename="../settings/settingsdialog.cpp" line="1260"/>
<source>unknown</source> <source>unknown</source>
<translation>unbekannt</translation> <translation>unbekannt</translation>
</message> </message>
@ -1104,22 +1122,22 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<translation>Stoppen</translation> <translation>Stoppen</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1174"/> <location filename="../settings/settingsdialog.cpp" line="1184"/>
<source>It is not possible to show the start/stop button for the systemd service and the internal launcher at the same time. The systemd service precedes.</source> <source>It is not possible to show the start/stop button for the systemd service and the internal launcher at the same time. The systemd service precedes.</source>
<translation>Es ist nicht möglich, den Start-/Stop-Button für den Systemd-Dienst und den internen Starter gleichzeitig anzugeigen. Wenn verfügbar, wird der Button den Systemd-Dienst kontrollieren.</translation> <translation>Es ist nicht möglich, den Start-/Stop-Button für den Systemd-Dienst und den internen Starter gleichzeitig anzugeigen. Wenn verfügbar, wird der Button den Systemd-Dienst kontrollieren.</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1180"/> <location filename="../settings/settingsdialog.cpp" line="1190"/>
<source>It is not possible to consider the systemd service and the internal launcher for reconnects at the same time. The systemd service precedes.</source> <source>It is not possible to consider the systemd service and the internal launcher for reconnects at the same time. The systemd service precedes.</source>
<translation>Es ist nicht möglich, den Status des Systemd-Dienstes und den des internen Starters gleichzeitig für Verbindungsveruche einzubeziehen. Wenn verfügbar, wird der Status des Systemd-Dienstes verwendet.</translation> <translation>Es ist nicht möglich, den Status des Systemd-Dienstes und den des internen Starters gleichzeitig für Verbindungsveruche einzubeziehen. Wenn verfügbar, wird der Status des Systemd-Dienstes verwendet.</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1211"/> <location filename="../settings/settingsdialog.cpp" line="1221"/>
<source>specified unit is either inactive or doesn&apos;t exist</source> <source>specified unit is either inactive or doesn&apos;t exist</source>
<translation>angegebene Unit entweder nicht geladen oder existiert nicht</translation> <translation>angegebene Unit entweder nicht geladen oder existiert nicht</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1233"/> <location filename="../settings/settingsdialog.cpp" line="1243"/>
<source>since </source> <source>since </source>
<translation>seit </translation> <translation>seit </translation>
</message> </message>
@ -1153,7 +1171,7 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<name>QtGui::WebViewOptionPage</name> <name>QtGui::WebViewOptionPage</name>
<message> <message>
<location filename="../settings/webviewoptionpage.ui" line="12"/> <location filename="../settings/webviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1272"/> <location filename="../settings/settingsdialog.cpp" line="1282"/>
<source>General</source> <source>General</source>
<translation>Allgemein</translation> <translation>Allgemein</translation>
</message> </message>
@ -1183,7 +1201,7 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<translation>Lasse Weboberfläche im Hintgergrund weiter offen, wenn Fenster nicht offen</translation> <translation>Lasse Weboberfläche im Hintgergrund weiter offen, wenn Fenster nicht offen</translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1274"/> <location filename="../settings/settingsdialog.cpp" line="1284"/>
<source>Syncthing Tray has not been built with vieb view support utilizing either Qt WebKit or Qt WebEngine. <source>Syncthing Tray has not been built with vieb view support utilizing either Qt WebKit or Qt WebEngine.
The Web UI will be opened in the default web browser instead.</source> The Web UI will be opened in the default web browser instead.</source>
<translation>Syncthing Tray wurde nicht mit Unterstützung für die eingebaute Anzeige der Weboberfläche unter Verwendung von Qt WebKit oder Qt WebEngine gebaut. <translation>Syncthing Tray wurde nicht mit Unterstützung für die eingebaute Anzeige der Weboberfläche unter Verwendung von Qt WebKit oder Qt WebEngine gebaut.

66
widgets/translations/syncthingwidgets_en_US.ts
View File

@ -682,7 +682,7 @@
</message> </message>
<message> <message>
<location filename="../settings/launcheroptionpage.ui" line="193"/> <location filename="../settings/launcheroptionpage.ui" line="193"/>
<location filename="../settings/settingsdialog.cpp" line="983"/> <location filename="../settings/settingsdialog.cpp" line="993"/>
<source>Stop launched instance</source> <source>Stop launched instance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -697,77 +697,77 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="876"/> <location filename="../settings/settingsdialog.cpp" line="878"/>
<source>%1-launcher</source> <source>%1-launcher</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="877"/> <location filename="../settings/settingsdialog.cpp" line="879"/>
<source>Launch %1 when starting the tray icon</source> <source>Launch %1 when starting the tray icon</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="878"/> <location filename="../settings/settingsdialog.cpp" line="882"/>
<source>%1 executable</source> <source>%1 executable</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="879"/> <location filename="../settings/settingsdialog.cpp" line="883"/>
<source>%1 log (interleaved stdout/stderr)</source> <source>%1 log (interleaved stdout/stderr)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="891"/> <location filename="../settings/settingsdialog.cpp" line="899"/>
<source>Restore default</source> <source>Restore default</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1018"/> <location filename="../settings/settingsdialog.cpp" line="1028"/>
<source>%1 exited with exit code %2</source> <source>%1 exited with exit code %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1021"/> <location filename="../settings/settingsdialog.cpp" line="1031"/>
<source>%1 crashed with exit code %2</source> <source>%1 crashed with exit code %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1048"/> <location filename="../settings/settingsdialog.cpp" line="1058"/>
<source>failed to start (e.g. executable does not exist or not permission error)</source> <source>failed to start (e.g. executable does not exist or not permission error)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1051"/> <location filename="../settings/settingsdialog.cpp" line="1061"/>
<source>process crashed</source> <source>process crashed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1054"/> <location filename="../settings/settingsdialog.cpp" line="1064"/>
<source>timeout error</source> <source>timeout error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1057"/> <location filename="../settings/settingsdialog.cpp" line="1067"/>
<source>read error</source> <source>read error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1060"/> <location filename="../settings/settingsdialog.cpp" line="1070"/>
<source>write error</source> <source>write error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1063"/> <location filename="../settings/settingsdialog.cpp" line="1073"/>
<source>unknown process error</source> <source>unknown process error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1065"/> <location filename="../settings/settingsdialog.cpp" line="1075"/>
<source>An error occurred when running %1: %2</source> <source>An error occurred when running %1: %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1116"/> <location filename="../settings/settingsdialog.cpp" line="1126"/>
<source>Kill launched instance</source> <source>Kill launched instance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -886,22 +886,32 @@
<context> <context>
<name>QtGui::SettingsDialog</name> <name>QtGui::SettingsDialog</name>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1323"/> <location filename="../settings/settingsdialog.cpp" line="1333"/>
<source>Tray</source> <source>Tray</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1330"/> <location filename="../settings/settingsdialog.cpp" line="1340"/>
<source>Web view</source> <source>Web view</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1337"/> <location filename="../settings/settingsdialog.cpp" line="1347"/>
<source>Startup</source> <source>Startup</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1359"/> <location filename="../settings/settingsdialog.cpp" line="1349"/>
<source>Extra launcher</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1349"/>
<source>additional tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1370"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1057,8 +1067,8 @@ This dialog closes automatically when the process finally terminates.</source>
<location filename="../settings/systemdoptionpage.ui" line="106"/> <location filename="../settings/systemdoptionpage.ui" line="106"/>
<location filename="../settings/systemdoptionpage.ui" line="161"/> <location filename="../settings/systemdoptionpage.ui" line="161"/>
<location filename="../settings/systemdoptionpage.ui" line="250"/> <location filename="../settings/systemdoptionpage.ui" line="250"/>
<location filename="../settings/settingsdialog.cpp" line="1238"/> <location filename="../settings/settingsdialog.cpp" line="1248"/>
<location filename="../settings/settingsdialog.cpp" line="1250"/> <location filename="../settings/settingsdialog.cpp" line="1260"/>
<source>unknown</source> <source>unknown</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1098,22 +1108,22 @@ This dialog closes automatically when the process finally terminates.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1174"/> <location filename="../settings/settingsdialog.cpp" line="1184"/>
<source>It is not possible to show the start/stop button for the systemd service and the internal launcher at the same time. The systemd service precedes.</source> <source>It is not possible to show the start/stop button for the systemd service and the internal launcher at the same time. The systemd service precedes.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1180"/> <location filename="../settings/settingsdialog.cpp" line="1190"/>
<source>It is not possible to consider the systemd service and the internal launcher for reconnects at the same time. The systemd service precedes.</source> <source>It is not possible to consider the systemd service and the internal launcher for reconnects at the same time. The systemd service precedes.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1211"/> <location filename="../settings/settingsdialog.cpp" line="1221"/>
<source>specified unit is either inactive or doesn&apos;t exist</source> <source>specified unit is either inactive or doesn&apos;t exist</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1233"/> <location filename="../settings/settingsdialog.cpp" line="1243"/>
<source>since </source> <source>since </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1147,7 +1157,7 @@ This dialog closes automatically when the process finally terminates.</source>
<name>QtGui::WebViewOptionPage</name> <name>QtGui::WebViewOptionPage</name>
<message> <message>
<location filename="../settings/webviewoptionpage.ui" line="12"/> <location filename="../settings/webviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1272"/> <location filename="../settings/settingsdialog.cpp" line="1282"/>
<source>General</source> <source>General</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1177,7 +1187,7 @@ This dialog closes automatically when the process finally terminates.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../settings/settingsdialog.cpp" line="1274"/> <location filename="../settings/settingsdialog.cpp" line="1284"/>
<source>Syncthing Tray has not been built with vieb view support utilizing either Qt WebKit or Qt WebEngine. <source>Syncthing Tray has not been built with vieb view support utilizing either Qt WebKit or Qt WebEngine.
The Web UI will be opened in the default web browser instead.</source> The Web UI will be opened in the default web browser instead.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>