Allow expanding paths in libsyncthing directory paths

Implements https://github.com/Martchus/syncthingtray/issues/243
This commit is contained in:
Martchus 2024-06-02 13:24:46 +02:00
parent 5a123d9b64
commit 3e259bd6cf
16 changed files with 532 additions and 253 deletions

@ -1 +1 @@
Subproject commit 388f287fcbb3212879033c2c2d19faa51e48dd7c
Subproject commit 178e288821a189e3bb70474ce45c660038e94790

View File

@ -167,7 +167,7 @@ std::int64_t runSyncthing(const RuntimeOptions &options)
return ::libst_run_syncthing(gostr(options.configDir), gostr(options.dataDir), gostr(options.guiAddress), gostr(options.guiApiKey),
options.flags & RuntimeFlags::Verbose, options.flags & RuntimeFlags::AllowNewerConfig, options.flags & RuntimeFlags::NoDefaultConfig,
options.flags & RuntimeFlags::SkipPortProbing, options.flags & RuntimeFlags::EnsureConfigDirExists,
options.flags & RuntimeFlags::EnsureDataDirExists);
options.flags & RuntimeFlags::EnsureDataDirExists, options.flags & RuntimeFlags::ExpandPathsFromEnv);
}
/*!

View File

@ -19,6 +19,7 @@ enum class RuntimeFlags : std::uint64_t {
EnsureConfigDirExists = (1 << 3),
EnsureDataDirExists = (1 << 4),
SkipPortProbing = (1 << 5),
ExpandPathsFromEnv = (1 << 6),
};
constexpr bool operator&(RuntimeFlags lhs, RuntimeFlags rhs)

View File

@ -382,77 +382,108 @@
<context>
<name>Data::SyncthingFileModel</name>
<message>
<location filename="../syncthingfilemodel.cpp" line="184"/>
<location filename="../syncthingfilemodel.cpp" line="241"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="186"/>
<location filename="../syncthingfilemodel.cpp" line="243"/>
<source>Size</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="188"/>
<location filename="../syncthingfilemodel.cpp" line="245"/>
<source>Last modified</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="190"/>
<location filename="../syncthingfilemodel.cpp" line="247"/>
<source>Ignore pattern</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="238"/>
<location filename="../syncthingfilemodel.cpp" line="295"/>
<source>%1 elements</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="324"/>
<location filename="../syncthingfilemodel.cpp" line="381"/>
<source>Refresh</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="326"/>
<location filename="../syncthingfilemodel.cpp" line="383"/>
<source>Deselect recursively</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="326"/>
<location filename="../syncthingfilemodel.cpp" line="383"/>
<source>Select recursively</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="327"/>
<location filename="../syncthingfilemodel.cpp" line="384"/>
<source>Deselect single item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="327"/>
<location filename="../syncthingfilemodel.cpp" line="384"/>
<source>Select single item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Open local version</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Copy local path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Browse locally</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="491"/>
<source>Discard selection</source>
<location filename="../syncthingfilemodel.cpp" line="560"/>
<source>Discard selection and staged changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="500"/>
<location filename="../syncthingfilemodel.cpp" line="591"/>
<source>Review and apply staged changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="597"/>
<source>Do you want to apply the folliwng changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="604"/>
<source>Cannot apply ignore patterns while a previous request for ignore patterns is still pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="612"/>
<source>Unable to change ignore patterns:
%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="626"/>
<source>Ignore patterns have been changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="775"/>
<source>Cannot query ignore patterns while a previous request for ignore patterns is still pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="572"/>
<source>Remove related ignore patterns</source>
<translation type="unfinished"></translation>
</message>

View File

@ -380,77 +380,108 @@
<context>
<name>Data::SyncthingFileModel</name>
<message>
<location filename="../syncthingfilemodel.cpp" line="184"/>
<location filename="../syncthingfilemodel.cpp" line="241"/>
<source>Name</source>
<translation></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="186"/>
<location filename="../syncthingfilemodel.cpp" line="243"/>
<source>Size</source>
<translation>Größe</translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="188"/>
<location filename="../syncthingfilemodel.cpp" line="245"/>
<source>Last modified</source>
<translation>Zuletzt geändert</translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="190"/>
<location filename="../syncthingfilemodel.cpp" line="247"/>
<source>Ignore pattern</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="238"/>
<location filename="../syncthingfilemodel.cpp" line="295"/>
<source>%1 elements</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="324"/>
<location filename="../syncthingfilemodel.cpp" line="381"/>
<source>Refresh</source>
<translation>Aktualisieren</translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="326"/>
<location filename="../syncthingfilemodel.cpp" line="383"/>
<source>Deselect recursively</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="326"/>
<location filename="../syncthingfilemodel.cpp" line="383"/>
<source>Select recursively</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="327"/>
<location filename="../syncthingfilemodel.cpp" line="384"/>
<source>Deselect single item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="327"/>
<location filename="../syncthingfilemodel.cpp" line="384"/>
<source>Select single item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Open local version</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Copy local path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Browse locally</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="491"/>
<source>Discard selection</source>
<location filename="../syncthingfilemodel.cpp" line="560"/>
<source>Discard selection and staged changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="500"/>
<location filename="../syncthingfilemodel.cpp" line="591"/>
<source>Review and apply staged changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="597"/>
<source>Do you want to apply the folliwng changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="604"/>
<source>Cannot apply ignore patterns while a previous request for ignore patterns is still pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="612"/>
<source>Unable to change ignore patterns:
%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="626"/>
<source>Ignore patterns have been changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="775"/>
<source>Cannot query ignore patterns while a previous request for ignore patterns is still pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="572"/>
<source>Remove related ignore patterns</source>
<translation type="unfinished"></translation>
</message>

View File

@ -380,77 +380,108 @@
<context>
<name>Data::SyncthingFileModel</name>
<message>
<location filename="../syncthingfilemodel.cpp" line="184"/>
<location filename="../syncthingfilemodel.cpp" line="241"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="186"/>
<location filename="../syncthingfilemodel.cpp" line="243"/>
<source>Size</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="188"/>
<location filename="../syncthingfilemodel.cpp" line="245"/>
<source>Last modified</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="190"/>
<location filename="../syncthingfilemodel.cpp" line="247"/>
<source>Ignore pattern</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="238"/>
<location filename="../syncthingfilemodel.cpp" line="295"/>
<source>%1 elements</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="324"/>
<location filename="../syncthingfilemodel.cpp" line="381"/>
<source>Refresh</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="326"/>
<location filename="../syncthingfilemodel.cpp" line="383"/>
<source>Deselect recursively</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="326"/>
<location filename="../syncthingfilemodel.cpp" line="383"/>
<source>Select recursively</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="327"/>
<location filename="../syncthingfilemodel.cpp" line="384"/>
<source>Deselect single item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="327"/>
<location filename="../syncthingfilemodel.cpp" line="384"/>
<source>Select single item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Open local version</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Copy local path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Browse locally</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="491"/>
<source>Discard selection</source>
<location filename="../syncthingfilemodel.cpp" line="560"/>
<source>Discard selection and staged changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="500"/>
<location filename="../syncthingfilemodel.cpp" line="591"/>
<source>Review and apply staged changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="597"/>
<source>Do you want to apply the folliwng changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="604"/>
<source>Cannot apply ignore patterns while a previous request for ignore patterns is still pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="612"/>
<source>Unable to change ignore patterns:
%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="626"/>
<source>Ignore patterns have been changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="775"/>
<source>Cannot query ignore patterns while a previous request for ignore patterns is still pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="572"/>
<source>Remove related ignore patterns</source>
<translation type="unfinished"></translation>
</message>

View File

@ -378,77 +378,108 @@
<context>
<name>Data::SyncthingFileModel</name>
<message>
<location filename="../syncthingfilemodel.cpp" line="184"/>
<location filename="../syncthingfilemodel.cpp" line="241"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="186"/>
<location filename="../syncthingfilemodel.cpp" line="243"/>
<source>Size</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="188"/>
<location filename="../syncthingfilemodel.cpp" line="245"/>
<source>Last modified</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="190"/>
<location filename="../syncthingfilemodel.cpp" line="247"/>
<source>Ignore pattern</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="238"/>
<location filename="../syncthingfilemodel.cpp" line="295"/>
<source>%1 elements</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="324"/>
<location filename="../syncthingfilemodel.cpp" line="381"/>
<source>Refresh</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="326"/>
<location filename="../syncthingfilemodel.cpp" line="383"/>
<source>Deselect recursively</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="326"/>
<location filename="../syncthingfilemodel.cpp" line="383"/>
<source>Select recursively</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="327"/>
<location filename="../syncthingfilemodel.cpp" line="384"/>
<source>Deselect single item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="327"/>
<location filename="../syncthingfilemodel.cpp" line="384"/>
<source>Select single item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Open local version</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Copy local path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="329"/>
<location filename="../syncthingfilemodel.cpp" line="386"/>
<source>Browse locally</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="491"/>
<source>Discard selection</source>
<location filename="../syncthingfilemodel.cpp" line="560"/>
<source>Discard selection and staged changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="500"/>
<location filename="../syncthingfilemodel.cpp" line="591"/>
<source>Review and apply staged changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="597"/>
<source>Do you want to apply the folliwng changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="604"/>
<source>Cannot apply ignore patterns while a previous request for ignore patterns is still pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="612"/>
<source>Unable to change ignore patterns:
%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="626"/>
<source>Ignore patterns have been changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="775"/>
<source>Cannot query ignore patterns while a previous request for ignore patterns is still pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../syncthingfilemodel.cpp" line="572"/>
<source>Remove related ignore patterns</source>
<translation type="unfinished"></translation>
</message>

View File

@ -187,6 +187,9 @@ void SyncthingLauncher::launch(const Settings::Launcher &launcherSettings)
auto options = LibSyncthing::RuntimeOptions();
options.configDir = libSyncthingSettings.configDir.toStdString();
options.dataDir = libSyncthingSettings.dataDir.isEmpty() ? options.configDir : libSyncthingSettings.dataDir.toStdString();
if (libSyncthingSettings.expandPaths) {
options.flags = options.flags | LibSyncthing::RuntimeFlags::ExpandPathsFromEnv;
}
setLibSyncthingLogLevel(libSyncthingSettings.logLevel);
launch(options);
#else

View File

@ -77,14 +77,14 @@
<item row="3" column="1">
<widget class="QtUtilities::PathSelection" name="configDirPathSelection" native="true"/>
</item>
<item row="5" column="0">
<item row="7" column="0">
<widget class="QLabel" name="logLevelLabel">
<property name="text">
<string>Log level</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="7" column="1">
<widget class="QComboBox" name="logLevelComboBox">
<item>
<property name="text">
@ -126,6 +126,20 @@
<item row="4" column="1">
<widget class="QtUtilities::PathSelection" name="dataDirPathSelection" native="true"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="optionsLabel">
<property name="text">
<string>Options</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="expandEnvCheckBox">
<property name="text">
<string>Replace ${var} or $var in directories with values from environment</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -419,5 +433,37 @@
</hint>
</hints>
</connection>
<connection>
<sender>useBuiltInVersionCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>optionsLabel</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>240</x>
<y>62</y>
</hint>
<hint type="destinationlabel">
<x>125</x>
<y>165</y>
</hint>
</hints>
</connection>
<connection>
<sender>useBuiltInVersionCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>expandEnvCheckBox</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>240</x>
<y>62</y>
</hint>
<hint type="destinationlabel">
<x>336</x>
<y>165</y>
</hint>
</hints>
</connection>
</connections>
</ui>

View File

@ -389,6 +389,7 @@ bool restore()
launcher.libSyncthing.dataDir = settings.value(QStringLiteral("libSyncthingDataDir"), launcher.libSyncthing.dataDir).toString();
launcher.libSyncthing.logLevel = static_cast<LibSyncthing::LogLevel>(
settings.value(QStringLiteral("libSyncthingLogLevel"), static_cast<int>(launcher.libSyncthing.logLevel)).toInt());
launcher.libSyncthing.expandPaths = settings.value(QStringLiteral("libSyncthingExpandPaths")).toBool();
#endif
launcher.syncthingPath = settings.value(QStringLiteral("syncthingPath"), launcher.syncthingPath).toString();
launcher.syncthingArgs = settings.value(QStringLiteral("syncthingArgs"), launcher.syncthingArgs).toString();
@ -519,6 +520,7 @@ bool save()
settings.setValue(QStringLiteral("libSyncthingConfigDir"), launcher.libSyncthing.configDir);
settings.setValue(QStringLiteral("libSyncthingDataDir"), launcher.libSyncthing.dataDir);
settings.setValue(QStringLiteral("libSyncthingLogLevel"), static_cast<int>(launcher.libSyncthing.logLevel));
settings.setValue(QStringLiteral("libSyncthingExpandPaths"), launcher.libSyncthing.expandPaths);
#endif
settings.setValue(QStringLiteral("syncthingPath"), launcher.syncthingPath);
settings.setValue(QStringLiteral("syncthingArgs"), launcher.syncthingArgs);

View File

@ -102,6 +102,7 @@ struct SYNCTHINGWIDGETS_EXPORT Launcher {
QString configDir;
QString dataDir;
::LibSyncthing::LogLevel logLevel = ::LibSyncthing::LogLevel::Info;
bool expandPaths = false;
} libSyncthing;
#endif

View File

@ -1124,7 +1124,7 @@ QWidget *LauncherOptionPage::setupWidget()
// hide libsyncthing-controls by default (as the checkbox is unchecked by default)
for (auto *const lstWidget : std::initializer_list<QWidget *>{ ui()->configDirLabel, ui()->configDirPathSelection, ui()->dataDirLabel,
ui()->dataDirPathSelection, ui()->logLevelLabel, ui()->logLevelComboBox }) {
ui()->dataDirPathSelection, ui()->logLevelLabel, ui()->logLevelComboBox, ui()->optionsLabel, ui()->expandEnvCheckBox }) {
lstWidget->setVisible(false);
}
@ -1196,6 +1196,7 @@ bool LauncherOptionPage::apply()
settings.libSyncthing.configDir = ui()->configDirPathSelection->lineEdit()->text();
settings.libSyncthing.dataDir = ui()->dataDirPathSelection->lineEdit()->text();
settings.libSyncthing.logLevel = static_cast<LibSyncthing::LogLevel>(ui()->logLevelComboBox->currentIndex());
settings.libSyncthing.expandPaths = ui()->expandEnvCheckBox->isChecked();
#endif
settings.syncthingPath = ui()->syncthingPathSelection->lineEdit()->text();
settings.syncthingArgs = ui()->argumentsLineEdit->text();
@ -1225,6 +1226,7 @@ void LauncherOptionPage::reset()
ui()->configDirPathSelection->lineEdit()->setText(settings.libSyncthing.configDir);
ui()->dataDirPathSelection->lineEdit()->setText(settings.libSyncthing.dataDir);
ui()->logLevelComboBox->setCurrentIndex(static_cast<int>(settings.libSyncthing.logLevel));
ui()->expandEnvCheckBox->setChecked(settings.libSyncthing.expandPaths);
#endif
ui()->syncthingPathSelection->lineEdit()->setText(settings.syncthingPath);
ui()->argumentsLineEdit->setText(settings.syncthingArgs);

View File

@ -462,7 +462,7 @@
<name>QtGui::BuiltinWebViewOptionPage</name>
<message>
<location filename="../settings/builtinwebviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1664"/>
<location filename="../settings/settingsdialog.cpp" line="1666"/>
<source>Built-in web view</source>
<translation type="unfinished"></translation>
</message>
@ -482,7 +482,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1666"/>
<location filename="../settings/settingsdialog.cpp" line="1668"/>
<source>Syncthing Tray has not been built with vieb view support utilizing either Qt WebKit or Qt WebEngine.</source>
<translation type="unfinished"></translation>
</message>
@ -965,12 +965,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1640"/>
<location filename="../settings/settingsdialog.cpp" line="1642"/>
<source>Custom command to launch Syncthing&apos;s UI - </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1641"/>
<location filename="../settings/settingsdialog.cpp" line="1643"/>
<source>&lt;p&gt;Enter a custom command to launch Syncthing&apos;s UI. The expression &lt;code&gt;%SYNCTHING_URL%&lt;/code&gt; will be replaced with the Syncthing-URL.&lt;/p&gt;&lt;p&gt;Leave the command empty to use the auto-detection.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
@ -1206,12 +1206,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="135"/>
<location filename="../settings/launcheroptionpage.ui" line="132"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="139"/>
<source>Replace ${var} or $var in directories with values from environment</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="149"/>
<source>Show start/stop button on tray for local instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="142"/>
<location filename="../settings/launcheroptionpage.ui" line="156"/>
<source>Consider process status for notifications and reconnect attempts concerning local instance
Don&apos;t reconnect when the process is not running
Try to reconnect when starting the process
@ -1219,33 +1229,33 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="152"/>
<location filename="../settings/launcheroptionpage.ui" line="166"/>
<source>Stop automatically when network connection is metered</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="179"/>
<location filename="../settings/launcheroptionpage.ui" line="193"/>
<source>Syncthing log (interleaved stdout/stderr)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="192"/>
<location filename="../settings/launcheroptionpage.ui" line="206"/>
<source>Apply and launch now</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="209"/>
<location filename="../settings/settingsdialog.cpp" line="1251"/>
<location filename="../settings/launcheroptionpage.ui" line="223"/>
<location filename="../settings/settingsdialog.cpp" line="1253"/>
<source>Stop launched instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="228"/>
<location filename="../settings/launcheroptionpage.ui" line="242"/>
<source>No log messages available yet</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="235"/>
<location filename="../settings/launcheroptionpage.ui" line="249"/>
<source>Ensure latest log is visible</source>
<translation type="unfinished"></translation>
</message>
@ -1280,52 +1290,52 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1286"/>
<location filename="../settings/settingsdialog.cpp" line="1288"/>
<source>%1 exited with exit code %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1289"/>
<location filename="../settings/settingsdialog.cpp" line="1291"/>
<source>%1 crashed with exit code %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1322"/>
<location filename="../settings/settingsdialog.cpp" line="1324"/>
<source>failed to start (e.g. executable does not exist or not permission error)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1325"/>
<location filename="../settings/settingsdialog.cpp" line="1327"/>
<source>process crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1328"/>
<location filename="../settings/settingsdialog.cpp" line="1330"/>
<source>timeout error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1331"/>
<location filename="../settings/settingsdialog.cpp" line="1333"/>
<source>read error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1334"/>
<location filename="../settings/settingsdialog.cpp" line="1336"/>
<source>write error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1337"/>
<location filename="../settings/settingsdialog.cpp" line="1339"/>
<source>unknown process error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1340"/>
<location filename="../settings/settingsdialog.cpp" line="1342"/>
<source>An error occurred when running %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1393"/>
<location filename="../settings/settingsdialog.cpp" line="1395"/>
<source>Kill launched instance</source>
<translation type="unfinished"></translation>
</message>
@ -1524,70 +1534,85 @@
<context>
<name>QtGui::OtherDialogs</name>
<message>
<location filename="../misc/otherdialogs.cpp" line="34"/>
<location filename="../misc/otherdialogs.cpp" line="35"/>
<source>Own device ID</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="44"/>
<location filename="../misc/otherdialogs.cpp" line="45"/>
<source>device ID is unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="52"/>
<location filename="../misc/otherdialogs.cpp" line="53"/>
<source>Copy to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="89"/>
<location filename="../misc/otherdialogs.cpp" line="90"/>
<source>Remote/global tree of folder &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="120"/>
<location filename="../misc/otherdialogs.cpp" line="123"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="151"/>
<location filename="../misc/otherdialogs.cpp" line="169"/>
<source>Ignore patterns of folder &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="191"/>
<source>Do you want to save the changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="199"/>
<source>Ignore patterns have been changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="204"/>
<source>Unable to save ignore patterns: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtGui::SettingsDialog</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="1715"/>
<location filename="../settings/settingsdialog.cpp" line="1717"/>
<source>Tray</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1723"/>
<location filename="../settings/settingsdialog.cpp" line="1725"/>
<source>Web view</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1730"/>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<source>Startup</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<location filename="../settings/settingsdialog.cpp" line="1734"/>
<source>additional tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<location filename="../settings/settingsdialog.cpp" line="1734"/>
<source>Extra launcher</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1755"/>
<location filename="../settings/settingsdialog.cpp" line="1757"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1761"/>
<location filename="../settings/settingsdialog.cpp" line="1763"/>
<source>Start wizard</source>
<translation type="unfinished"></translation>
</message>
@ -1753,8 +1778,8 @@ This dialog closes automatically when the process finally terminates.</source>
<location filename="../settings/systemdoptionpage.ui" line="117"/>
<location filename="../settings/systemdoptionpage.ui" line="172"/>
<location filename="../settings/systemdoptionpage.ui" line="261"/>
<location filename="../settings/settingsdialog.cpp" line="1539"/>
<location filename="../settings/settingsdialog.cpp" line="1548"/>
<location filename="../settings/settingsdialog.cpp" line="1541"/>
<location filename="../settings/settingsdialog.cpp" line="1550"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
@ -1794,27 +1819,27 @@ This dialog closes automatically when the process finally terminates.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1429"/>
<location filename="../settings/settingsdialog.cpp" line="1431"/>
<source>Reload all unit files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1474"/>
<location filename="../settings/settingsdialog.cpp" line="1476"/>
<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>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1480"/>
<location filename="../settings/settingsdialog.cpp" line="1482"/>
<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>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1512"/>
<location filename="../settings/settingsdialog.cpp" line="1514"/>
<source>specified unit is either inactive or doesn&apos;t exist</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1534"/>
<location filename="../settings/settingsdialog.cpp" line="1536"/>
<source>since </source>
<translation type="unfinished"></translation>
</message>
@ -1822,8 +1847,8 @@ This dialog closes automatically when the process finally terminates.</source>
<context>
<name>QtGui::TextViewDialog</name>
<message>
<location filename="../misc/textviewdialog.cpp" line="61"/>
<location filename="../misc/textviewdialog.cpp" line="70"/>
<location filename="../misc/textviewdialog.cpp" line="62"/>
<location filename="../misc/textviewdialog.cpp" line="71"/>
<source>Log</source>
<translation type="unfinished"></translation>
</message>
@ -2118,7 +2143,7 @@ This dialog closes automatically when the process finally terminates.</source>
<context>
<name>Settings::Connection</name>
<message>
<location filename="../settings/settings.cpp" line="670"/>
<location filename="../settings/settings.cpp" line="672"/>
<source>Backup of %1 (created by wizard)</source>
<translation type="unfinished"></translation>
</message>

View File

@ -606,7 +606,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
</message>
<message>
<location filename="../settings/builtinwebviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1664"/>
<location filename="../settings/settingsdialog.cpp" line="1666"/>
<source>Built-in web view</source>
<translation>Eingebaute Webanzeige</translation>
</message>
@ -626,7 +626,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
<translation>Lasse Weboberfläche im Hintgergrund weiter offen, wenn Fenster nicht offen</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1666"/>
<location filename="../settings/settingsdialog.cpp" line="1668"/>
<source>Syncthing Tray has not been built with vieb view support utilizing either Qt WebKit or Qt WebEngine.</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>
</message>
@ -1120,12 +1120,12 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1640"/>
<location filename="../settings/settingsdialog.cpp" line="1642"/>
<source>Custom command to launch Syncthing&apos;s UI - </source>
<translation>Befehl zum Starten der Syncthing-Oberfläche - </translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1641"/>
<location filename="../settings/settingsdialog.cpp" line="1643"/>
<source>&lt;p&gt;Enter a custom command to launch Syncthing&apos;s UI. The expression &lt;code&gt;%SYNCTHING_URL%&lt;/code&gt; will be replaced with the Syncthing-URL.&lt;/p&gt;&lt;p&gt;Leave the command empty to use the auto-detection.&lt;/p&gt;</source>
<translation>&lt;p&gt;Gib den Befehl ein, mit dem die Syncthing-Oberfläche gestartet werden soll. Der Ausdruck &lt;code&gt;%SYNCTHING_URL%&lt;/code&gt; wird durch die Syncthing-URL ersetzt.&lt;/p&gt;&lt;p&gt;Lasse den Befehl leer, um die automatische Erkennung zu verwenden.&lt;/p&gt;</translation>
</message>
@ -1379,12 +1379,22 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
<translation>Datenverzeichnis</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="135"/>
<location filename="../settings/launcheroptionpage.ui" line="132"/>
<source>Options</source>
<translation>Optionen</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="139"/>
<source>Replace ${var} or $var in directories with values from environment</source>
<translation>Ersetze ${var} or $var in Verzeichnispfaden mit Werten der Umgebung</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="149"/>
<source>Show start/stop button on tray for local instance</source>
<translation>Zeige Start/Stop-Button für die lokale Instanz</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="142"/>
<location filename="../settings/launcheroptionpage.ui" line="156"/>
<source>Consider process status for notifications and reconnect attempts concerning local instance
Don&apos;t reconnect when the process is not running
Try to reconnect when starting the process
@ -1395,7 +1405,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
Unterdrücke Benachrichtigung über Verbindungsabbruch, wenn Syncthing manuell gestoppt wurde</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="152"/>
<location filename="../settings/launcheroptionpage.ui" line="166"/>
<source>Stop automatically when network connection is metered</source>
<translation>Stoppe Syncthing automatisch solange die Netzwerkverbindung getaktet ist</translation>
</message>
@ -1408,28 +1418,28 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
Automatisch neu verbinden, wenn Syncthing gestartet wird</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="179"/>
<location filename="../settings/launcheroptionpage.ui" line="193"/>
<source>Syncthing log (interleaved stdout/stderr)</source>
<translation>Syncthing-Log (stdout/stderr)</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="192"/>
<location filename="../settings/launcheroptionpage.ui" line="206"/>
<source>Apply and launch now</source>
<translation>Jetzt starten</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="209"/>
<location filename="../settings/settingsdialog.cpp" line="1251"/>
<location filename="../settings/launcheroptionpage.ui" line="223"/>
<location filename="../settings/settingsdialog.cpp" line="1253"/>
<source>Stop launched instance</source>
<translation>Stoppen</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="228"/>
<location filename="../settings/launcheroptionpage.ui" line="242"/>
<source>No log messages available yet</source>
<translation>Bisher keine Log-Meldungen</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="235"/>
<location filename="../settings/launcheroptionpage.ui" line="249"/>
<source>Ensure latest log is visible</source>
<translation>Log folgen</translation>
</message>
@ -1468,52 +1478,52 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
<translation>Syncthing Releases/Downloads zeigen</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1286"/>
<location filename="../settings/settingsdialog.cpp" line="1288"/>
<source>%1 exited with exit code %2</source>
<translation>%1 wurde mit dem Statuscode %2 beendet</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1289"/>
<location filename="../settings/settingsdialog.cpp" line="1291"/>
<source>%1 crashed with exit code %2</source>
<translation>%1 ist mit dem Statuscode %2 abgestürzt</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1322"/>
<location filename="../settings/settingsdialog.cpp" line="1324"/>
<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>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1325"/>
<location filename="../settings/settingsdialog.cpp" line="1327"/>
<source>process crashed</source>
<translation>Prozess ist abgestürzt</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1328"/>
<location filename="../settings/settingsdialog.cpp" line="1330"/>
<source>timeout error</source>
<translation>Time-out</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1331"/>
<location filename="../settings/settingsdialog.cpp" line="1333"/>
<source>read error</source>
<translation>Lesefehler</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1334"/>
<location filename="../settings/settingsdialog.cpp" line="1336"/>
<source>write error</source>
<translation>Schreibfehler</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1337"/>
<location filename="../settings/settingsdialog.cpp" line="1339"/>
<source>unknown process error</source>
<translation>unbekannter Fehler</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1340"/>
<location filename="../settings/settingsdialog.cpp" line="1342"/>
<source>An error occurred when running %1: %2</source>
<translation>Beim Ausführen von %1 ist ein Fehler aufgetreten: %2</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1393"/>
<location filename="../settings/settingsdialog.cpp" line="1395"/>
<source>Kill launched instance</source>
<translation>Töten</translation>
</message>
@ -1720,45 +1730,60 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
<context>
<name>QtGui::OtherDialogs</name>
<message>
<location filename="../misc/otherdialogs.cpp" line="34"/>
<location filename="../misc/otherdialogs.cpp" line="35"/>
<source>Own device ID</source>
<translation>Eigene Geräte-ID</translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="44"/>
<location filename="../misc/otherdialogs.cpp" line="45"/>
<source>device ID is unknown</source>
<translation>Geräte-ID ist unbekannt</translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="52"/>
<location filename="../misc/otherdialogs.cpp" line="53"/>
<source>Copy to clipboard</source>
<translation>In Zwischenablage kopieren</translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="89"/>
<location filename="../misc/otherdialogs.cpp" line="90"/>
<source>Remote/global tree of folder &quot;%1&quot;</source>
<translation>Globale Dateistruktur von &quot;%1&quot;</translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="120"/>
<location filename="../misc/otherdialogs.cpp" line="123"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="151"/>
<location filename="../misc/otherdialogs.cpp" line="169"/>
<source>Ignore patterns of folder &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="191"/>
<source>Do you want to save the changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="199"/>
<source>Ignore patterns have been changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="204"/>
<source>Unable to save ignore patterns: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtGui::SettingsDialog</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="1723"/>
<location filename="../settings/settingsdialog.cpp" line="1725"/>
<source>Web view</source>
<translation>Webanzeige</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1730"/>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<source>Startup</source>
<translation>Starten</translation>
</message>
@ -1767,27 +1792,27 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
<translation type="vanished">Zusatztool</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1715"/>
<location filename="../settings/settingsdialog.cpp" line="1717"/>
<source>Tray</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<location filename="../settings/settingsdialog.cpp" line="1734"/>
<source>Extra launcher</source>
<translation>Extra-Starter</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<location filename="../settings/settingsdialog.cpp" line="1734"/>
<source>additional tool</source>
<translation>Zusatztool</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1755"/>
<location filename="../settings/settingsdialog.cpp" line="1757"/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1761"/>
<location filename="../settings/settingsdialog.cpp" line="1763"/>
<source>Start wizard</source>
<translation>Einrichtungsassistenten öffnen</translation>
</message>
@ -1985,8 +2010,8 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<location filename="../settings/systemdoptionpage.ui" line="117"/>
<location filename="../settings/systemdoptionpage.ui" line="172"/>
<location filename="../settings/systemdoptionpage.ui" line="261"/>
<location filename="../settings/settingsdialog.cpp" line="1539"/>
<location filename="../settings/settingsdialog.cpp" line="1548"/>
<location filename="../settings/settingsdialog.cpp" line="1541"/>
<location filename="../settings/settingsdialog.cpp" line="1550"/>
<source>unknown</source>
<translation>unbekannt</translation>
</message>
@ -2019,27 +2044,27 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<translation>Stoppen</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1429"/>
<location filename="../settings/settingsdialog.cpp" line="1431"/>
<source>Reload all unit files</source>
<translation>Alle Unit-Dateien neu laden</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1474"/>
<location filename="../settings/settingsdialog.cpp" line="1476"/>
<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>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1480"/>
<location filename="../settings/settingsdialog.cpp" line="1482"/>
<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>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1512"/>
<location filename="../settings/settingsdialog.cpp" line="1514"/>
<source>specified unit is either inactive or doesn&apos;t exist</source>
<translation>angegebene Unit entweder nicht geladen oder existiert nicht</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1534"/>
<location filename="../settings/settingsdialog.cpp" line="1536"/>
<source>since </source>
<translation>seit </translation>
</message>
@ -2047,8 +2072,8 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<context>
<name>QtGui::TextViewDialog</name>
<message>
<location filename="../misc/textviewdialog.cpp" line="61"/>
<location filename="../misc/textviewdialog.cpp" line="70"/>
<location filename="../misc/textviewdialog.cpp" line="62"/>
<location filename="../misc/textviewdialog.cpp" line="71"/>
<source>Log</source>
<translation></translation>
</message>
@ -2394,7 +2419,7 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<context>
<name>Settings::Connection</name>
<message>
<location filename="../settings/settings.cpp" line="670"/>
<location filename="../settings/settings.cpp" line="672"/>
<source>Backup of %1 (created by wizard)</source>
<translation>Sicherung von %1 (vom Einrichtungsassistenten erstellt)</translation>
</message>

View File

@ -462,7 +462,7 @@
<name>QtGui::BuiltinWebViewOptionPage</name>
<message>
<location filename="../settings/builtinwebviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1664"/>
<location filename="../settings/settingsdialog.cpp" line="1666"/>
<source>Built-in web view</source>
<translation type="unfinished"></translation>
</message>
@ -482,7 +482,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1666"/>
<location filename="../settings/settingsdialog.cpp" line="1668"/>
<source>Syncthing Tray has not been built with vieb view support utilizing either Qt WebKit or Qt WebEngine.</source>
<translation type="unfinished"></translation>
</message>
@ -964,12 +964,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1640"/>
<location filename="../settings/settingsdialog.cpp" line="1642"/>
<source>Custom command to launch Syncthing&apos;s UI - </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1641"/>
<location filename="../settings/settingsdialog.cpp" line="1643"/>
<source>&lt;p&gt;Enter a custom command to launch Syncthing&apos;s UI. The expression &lt;code&gt;%SYNCTHING_URL%&lt;/code&gt; will be replaced with the Syncthing-URL.&lt;/p&gt;&lt;p&gt;Leave the command empty to use the auto-detection.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
@ -1204,12 +1204,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="135"/>
<location filename="../settings/launcheroptionpage.ui" line="132"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="139"/>
<source>Replace ${var} or $var in directories with values from environment</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="149"/>
<source>Show start/stop button on tray for local instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="142"/>
<location filename="../settings/launcheroptionpage.ui" line="156"/>
<source>Consider process status for notifications and reconnect attempts concerning local instance
Don&apos;t reconnect when the process is not running
Try to reconnect when starting the process
@ -1217,33 +1227,33 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="152"/>
<location filename="../settings/launcheroptionpage.ui" line="166"/>
<source>Stop automatically when network connection is metered</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="179"/>
<location filename="../settings/launcheroptionpage.ui" line="193"/>
<source>Syncthing log (interleaved stdout/stderr)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="192"/>
<location filename="../settings/launcheroptionpage.ui" line="206"/>
<source>Apply and launch now</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="209"/>
<location filename="../settings/settingsdialog.cpp" line="1251"/>
<location filename="../settings/launcheroptionpage.ui" line="223"/>
<location filename="../settings/settingsdialog.cpp" line="1253"/>
<source>Stop launched instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="228"/>
<location filename="../settings/launcheroptionpage.ui" line="242"/>
<source>No log messages available yet</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="235"/>
<location filename="../settings/launcheroptionpage.ui" line="249"/>
<source>Ensure latest log is visible</source>
<translation type="unfinished"></translation>
</message>
@ -1278,52 +1288,52 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1286"/>
<location filename="../settings/settingsdialog.cpp" line="1288"/>
<source>%1 exited with exit code %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1289"/>
<location filename="../settings/settingsdialog.cpp" line="1291"/>
<source>%1 crashed with exit code %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1322"/>
<location filename="../settings/settingsdialog.cpp" line="1324"/>
<source>failed to start (e.g. executable does not exist or not permission error)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1325"/>
<location filename="../settings/settingsdialog.cpp" line="1327"/>
<source>process crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1328"/>
<location filename="../settings/settingsdialog.cpp" line="1330"/>
<source>timeout error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1331"/>
<location filename="../settings/settingsdialog.cpp" line="1333"/>
<source>read error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1334"/>
<location filename="../settings/settingsdialog.cpp" line="1336"/>
<source>write error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1337"/>
<location filename="../settings/settingsdialog.cpp" line="1339"/>
<source>unknown process error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1340"/>
<location filename="../settings/settingsdialog.cpp" line="1342"/>
<source>An error occurred when running %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1393"/>
<location filename="../settings/settingsdialog.cpp" line="1395"/>
<source>Kill launched instance</source>
<translation type="unfinished"></translation>
</message>
@ -1522,70 +1532,85 @@
<context>
<name>QtGui::OtherDialogs</name>
<message>
<location filename="../misc/otherdialogs.cpp" line="34"/>
<location filename="../misc/otherdialogs.cpp" line="35"/>
<source>Own device ID</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="44"/>
<location filename="../misc/otherdialogs.cpp" line="45"/>
<source>device ID is unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="52"/>
<location filename="../misc/otherdialogs.cpp" line="53"/>
<source>Copy to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="89"/>
<location filename="../misc/otherdialogs.cpp" line="90"/>
<source>Remote/global tree of folder &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="120"/>
<location filename="../misc/otherdialogs.cpp" line="123"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="151"/>
<location filename="../misc/otherdialogs.cpp" line="169"/>
<source>Ignore patterns of folder &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="191"/>
<source>Do you want to save the changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="199"/>
<source>Ignore patterns have been changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="204"/>
<source>Unable to save ignore patterns: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtGui::SettingsDialog</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="1715"/>
<location filename="../settings/settingsdialog.cpp" line="1717"/>
<source>Tray</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1723"/>
<location filename="../settings/settingsdialog.cpp" line="1725"/>
<source>Web view</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1730"/>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<source>Startup</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<location filename="../settings/settingsdialog.cpp" line="1734"/>
<source>additional tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<location filename="../settings/settingsdialog.cpp" line="1734"/>
<source>Extra launcher</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1755"/>
<location filename="../settings/settingsdialog.cpp" line="1757"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1761"/>
<location filename="../settings/settingsdialog.cpp" line="1763"/>
<source>Start wizard</source>
<translation type="unfinished"></translation>
</message>
@ -1755,8 +1780,8 @@ This dialog closes automatically when the process finally terminates.</source>
<location filename="../settings/systemdoptionpage.ui" line="117"/>
<location filename="../settings/systemdoptionpage.ui" line="172"/>
<location filename="../settings/systemdoptionpage.ui" line="261"/>
<location filename="../settings/settingsdialog.cpp" line="1539"/>
<location filename="../settings/settingsdialog.cpp" line="1548"/>
<location filename="../settings/settingsdialog.cpp" line="1541"/>
<location filename="../settings/settingsdialog.cpp" line="1550"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
@ -1796,27 +1821,27 @@ This dialog closes automatically when the process finally terminates.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1429"/>
<location filename="../settings/settingsdialog.cpp" line="1431"/>
<source>Reload all unit files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1474"/>
<location filename="../settings/settingsdialog.cpp" line="1476"/>
<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>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1480"/>
<location filename="../settings/settingsdialog.cpp" line="1482"/>
<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>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1512"/>
<location filename="../settings/settingsdialog.cpp" line="1514"/>
<source>specified unit is either inactive or doesn&apos;t exist</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1534"/>
<location filename="../settings/settingsdialog.cpp" line="1536"/>
<source>since </source>
<translation type="unfinished"></translation>
</message>
@ -1824,8 +1849,8 @@ This dialog closes automatically when the process finally terminates.</source>
<context>
<name>QtGui::TextViewDialog</name>
<message>
<location filename="../misc/textviewdialog.cpp" line="61"/>
<location filename="../misc/textviewdialog.cpp" line="70"/>
<location filename="../misc/textviewdialog.cpp" line="62"/>
<location filename="../misc/textviewdialog.cpp" line="71"/>
<source>Log</source>
<translation type="unfinished"></translation>
</message>
@ -2120,7 +2145,7 @@ This dialog closes automatically when the process finally terminates.</source>
<context>
<name>Settings::Connection</name>
<message>
<location filename="../settings/settings.cpp" line="670"/>
<location filename="../settings/settings.cpp" line="672"/>
<source>Backup of %1 (created by wizard)</source>
<translation type="unfinished"></translation>
</message>

View File

@ -480,7 +480,7 @@ The Web UI will be opened in the default web browser instead.</source>
</message>
<message>
<location filename="../settings/builtinwebviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1664"/>
<location filename="../settings/settingsdialog.cpp" line="1666"/>
<source>Built-in web view</source>
<translation type="unfinished"></translation>
</message>
@ -500,7 +500,7 @@ The Web UI will be opened in the default web browser instead.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1666"/>
<location filename="../settings/settingsdialog.cpp" line="1668"/>
<source>Syncthing Tray has not been built with vieb view support utilizing either Qt WebKit or Qt WebEngine.</source>
<translation type="unfinished"></translation>
</message>
@ -985,12 +985,12 @@ The Web UI will be opened in the default web browser instead.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1640"/>
<location filename="../settings/settingsdialog.cpp" line="1642"/>
<source>Custom command to launch Syncthing&apos;s UI - </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1641"/>
<location filename="../settings/settingsdialog.cpp" line="1643"/>
<source>&lt;p&gt;Enter a custom command to launch Syncthing&apos;s UI. The expression &lt;code&gt;%SYNCTHING_URL%&lt;/code&gt; will be replaced with the Syncthing-URL.&lt;/p&gt;&lt;p&gt;Leave the command empty to use the auto-detection.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
@ -1224,12 +1224,22 @@ The Web UI will be opened in the default web browser instead.</source>
<translation></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="135"/>
<location filename="../settings/launcheroptionpage.ui" line="132"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="139"/>
<source>Replace ${var} or $var in directories with values from environment</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="149"/>
<source>Show start/stop button on tray for local instance</source>
<translation>/</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="142"/>
<location filename="../settings/launcheroptionpage.ui" line="156"/>
<source>Consider process status for notifications and reconnect attempts concerning local instance
Don&apos;t reconnect when the process is not running
Try to reconnect when starting the process
@ -1237,7 +1247,7 @@ The Web UI will be opened in the default web browser instead.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="152"/>
<location filename="../settings/launcheroptionpage.ui" line="166"/>
<source>Stop automatically when network connection is metered</source>
<translation type="unfinished"></translation>
</message>
@ -1250,28 +1260,28 @@ The Web UI will be opened in the default web browser instead.</source>
</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="179"/>
<location filename="../settings/launcheroptionpage.ui" line="193"/>
<source>Syncthing log (interleaved stdout/stderr)</source>
<translation>/</translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="192"/>
<location filename="../settings/launcheroptionpage.ui" line="206"/>
<source>Apply and launch now</source>
<translation></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="209"/>
<location filename="../settings/settingsdialog.cpp" line="1251"/>
<location filename="../settings/launcheroptionpage.ui" line="223"/>
<location filename="../settings/settingsdialog.cpp" line="1253"/>
<source>Stop launched instance</source>
<translation></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="228"/>
<location filename="../settings/launcheroptionpage.ui" line="242"/>
<source>No log messages available yet</source>
<translation></translation>
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="235"/>
<location filename="../settings/launcheroptionpage.ui" line="249"/>
<source>Ensure latest log is visible</source>
<translation></translation>
</message>
@ -1306,52 +1316,52 @@ The Web UI will be opened in the default web browser instead.</source>
<translation> Syncthing /</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1286"/>
<location filename="../settings/settingsdialog.cpp" line="1288"/>
<source>%1 exited with exit code %2</source>
<translation>%1 退退 %2</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1289"/>
<location filename="../settings/settingsdialog.cpp" line="1291"/>
<source>%1 crashed with exit code %2</source>
<translation>%1 退 %2</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1322"/>
<location filename="../settings/settingsdialog.cpp" line="1324"/>
<source>failed to start (e.g. executable does not exist or not permission error)</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1325"/>
<location filename="../settings/settingsdialog.cpp" line="1327"/>
<source>process crashed</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1328"/>
<location filename="../settings/settingsdialog.cpp" line="1330"/>
<source>timeout error</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1331"/>
<location filename="../settings/settingsdialog.cpp" line="1333"/>
<source>read error</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1334"/>
<location filename="../settings/settingsdialog.cpp" line="1336"/>
<source>write error</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1337"/>
<location filename="../settings/settingsdialog.cpp" line="1339"/>
<source>unknown process error</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1340"/>
<location filename="../settings/settingsdialog.cpp" line="1342"/>
<source>An error occurred when running %1: %2</source>
<translation> %1 : %2</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1393"/>
<location filename="../settings/settingsdialog.cpp" line="1395"/>
<source>Kill launched instance</source>
<translation></translation>
</message>
@ -1558,70 +1568,85 @@ The Web UI will be opened in the default web browser instead.</source>
<context>
<name>QtGui::OtherDialogs</name>
<message>
<location filename="../misc/otherdialogs.cpp" line="34"/>
<location filename="../misc/otherdialogs.cpp" line="35"/>
<source>Own device ID</source>
<translation> ID</translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="44"/>
<location filename="../misc/otherdialogs.cpp" line="45"/>
<source>device ID is unknown</source>
<translation> ID </translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="52"/>
<location filename="../misc/otherdialogs.cpp" line="53"/>
<source>Copy to clipboard</source>
<translation></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="89"/>
<location filename="../misc/otherdialogs.cpp" line="90"/>
<source>Remote/global tree of folder &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="120"/>
<location filename="../misc/otherdialogs.cpp" line="123"/>
<source>Selection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="151"/>
<location filename="../misc/otherdialogs.cpp" line="169"/>
<source>Ignore patterns of folder &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="191"/>
<source>Do you want to save the changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="199"/>
<source>Ignore patterns have been changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../misc/otherdialogs.cpp" line="204"/>
<source>Unable to save ignore patterns: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtGui::SettingsDialog</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="1715"/>
<location filename="../settings/settingsdialog.cpp" line="1717"/>
<source>Tray</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1723"/>
<location filename="../settings/settingsdialog.cpp" line="1725"/>
<source>Web view</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1730"/>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<source>Startup</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<location filename="../settings/settingsdialog.cpp" line="1734"/>
<source>additional tool</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1732"/>
<location filename="../settings/settingsdialog.cpp" line="1734"/>
<source>Extra launcher</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1755"/>
<location filename="../settings/settingsdialog.cpp" line="1757"/>
<source>Settings</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1761"/>
<location filename="../settings/settingsdialog.cpp" line="1763"/>
<source>Start wizard</source>
<translation type="unfinished"></translation>
</message>
@ -1810,8 +1835,8 @@ This dialog closes automatically when the process finally terminates.</source>
<location filename="../settings/systemdoptionpage.ui" line="117"/>
<location filename="../settings/systemdoptionpage.ui" line="172"/>
<location filename="../settings/systemdoptionpage.ui" line="261"/>
<location filename="../settings/settingsdialog.cpp" line="1539"/>
<location filename="../settings/settingsdialog.cpp" line="1548"/>
<location filename="../settings/settingsdialog.cpp" line="1541"/>
<location filename="../settings/settingsdialog.cpp" line="1550"/>
<source>unknown</source>
<translation></translation>
</message>
@ -1846,27 +1871,27 @@ This dialog closes automatically when the process finally terminates.</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1429"/>
<location filename="../settings/settingsdialog.cpp" line="1431"/>
<source>Reload all unit files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1474"/>
<location filename="../settings/settingsdialog.cpp" line="1476"/>
<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> systemd / systemd </translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1480"/>
<location filename="../settings/settingsdialog.cpp" line="1482"/>
<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> systemd systemd </translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1512"/>
<location filename="../settings/settingsdialog.cpp" line="1514"/>
<source>specified unit is either inactive or doesn&apos;t exist</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1534"/>
<location filename="../settings/settingsdialog.cpp" line="1536"/>
<source>since </source>
<translation> </translation>
</message>
@ -1874,8 +1899,8 @@ This dialog closes automatically when the process finally terminates.</source>
<context>
<name>QtGui::TextViewDialog</name>
<message>
<location filename="../misc/textviewdialog.cpp" line="61"/>
<location filename="../misc/textviewdialog.cpp" line="70"/>
<location filename="../misc/textviewdialog.cpp" line="62"/>
<location filename="../misc/textviewdialog.cpp" line="71"/>
<source>Log</source>
<translation></translation>
</message>
@ -2207,7 +2232,7 @@ The Web UI will be opened in the default web browser instead.</source>
<context>
<name>Settings::Connection</name>
<message>
<location filename="../settings/settings.cpp" line="670"/>
<location filename="../settings/settings.cpp" line="672"/>
<source>Backup of %1 (created by wizard)</source>
<translation type="unfinished"></translation>
</message>