Allow using system icons instead of ForkAwesome icons

* Allow using icons from freedesktop.org icon theme for most ForkAwesome
  icons if available
* Let's not use it for the nested list of details in the models for now
* See https://github.com/Martchus/syncthingtray/issues/121
This commit is contained in:
Martchus 2022-10-03 14:40:14 +02:00
parent 598fc0c114
commit d82bc710fd
27 changed files with 414 additions and 264 deletions

View File

@ -11,7 +11,7 @@ set(META_GUI_OPTIONAL false)
set(META_VERSION_MAJOR 1)
set(META_VERSION_MINOR 3)
set(META_VERSION_PATCH 0)
set(META_SOVERSION 2)
set(META_SOVERSION 3)
set(META_ADD_DEFAULT_CPP_UNIT_TEST_APPLICATION ON)
project(${META_PROJECT_NAME})

View File

@ -48,7 +48,7 @@ find_package(syncthingconnector ${META_APP_VERSION} REQUIRED)
use_syncthingconnector(VISIBILITY PUBLIC)
# find qtforkawesome
find_package(${PACKAGE_NAMESPACE_PREFIX}qtforkawesome${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME} 0.0.1 REQUIRED)
find_package(${PACKAGE_NAMESPACE_PREFIX}qtforkawesome${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME} 0.1.0 REQUIRED)
use_qt_fork_awesome(VISIBILITY PUBLIC)
# link also explicitly against the following Qt modules

View File

@ -351,4 +351,31 @@ QImage aboutDialogImage()
return renderSvgImage(makeSyncthingIcon(), QSize(128, 128)).toImage();
}
void setForkAwesomeThemeOverrides()
{
auto &renderer = QtForkAwesome::Renderer::global();
renderer.addThemeOverride(QtForkAwesome::Icon::Folder, QStringLiteral("folder-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::Sitemap, QStringLiteral("network-server-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::Download, QStringLiteral("folder-download-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::History, QStringLiteral("shallow-history"));
renderer.addThemeOverride(QtForkAwesome::Icon::History, QStringLiteral("view-history"));
renderer.addThemeOverride(QtForkAwesome::Icon::Refresh, QStringLiteral("view-refresh-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::Pause, QStringLiteral("media-playback-pause"));
renderer.addThemeOverride(QtForkAwesome::Icon::Play, QStringLiteral("media-playback-start"));
renderer.addThemeOverride(QtForkAwesome::Icon::Stop, QStringLiteral("media-playback-stop"));
renderer.addThemeOverride(QtForkAwesome::Icon::Home, QStringLiteral("user-home-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::Globe, QStringLiteral("globe-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::Info, QStringLiteral("help-about-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::Cog, QStringLiteral("settings-configure"));
renderer.addThemeOverride(QtForkAwesome::Icon::Cog, QStringLiteral("system-settings-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::Plug, QStringLiteral("network-connect"));
renderer.addThemeOverride(QtForkAwesome::Icon::Qrcode, QStringLiteral("qrscanner-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::Qrcode, QStringLiteral("view-barcode-qr"));
renderer.addThemeOverride(QtForkAwesome::Icon::PowerOff, QStringLiteral("system-shutdown-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::FileText, QStringLiteral("terminal-symbolic"));
renderer.addThemeOverride(QtForkAwesome::Icon::CloudUpload, QStringLiteral("cloud-upload"));
renderer.addThemeOverride(QtForkAwesome::Icon::CloudDownload, QStringLiteral("cloud-download"));
renderer.addThemeOverride(QtForkAwesome::Icon::Search, QStringLiteral("search"));
}
} // namespace Data

View File

@ -221,6 +221,8 @@ inline const ForkAwesomeIcons &commonForkAwesomeIcons()
LIB_SYNCTHING_MODEL_EXPORT QString aboutDialogAttribution();
LIB_SYNCTHING_MODEL_EXPORT QImage aboutDialogImage();
LIB_SYNCTHING_MODEL_EXPORT void setForkAwesomeThemeOverrides();
} // namespace Data
#endif // DATA_SYNCTHINGICONS_H

View File

@ -114,7 +114,7 @@
</item>
</layout>
</item>
<item row="3" column="0">
<item row="5" column="0">
<widget class="QLabel" name="passiveLabel">
<property name="text">
<string>States to enable passive mode</string>
@ -124,7 +124,7 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="5" column="1">
<widget class="QListView" name="passiveListView">
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
@ -135,7 +135,7 @@
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel" name="optionalGuiElementsLabel">
<property name="text">
<string>Optional GUI elements</string>
</property>
@ -148,6 +148,27 @@
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QVBoxLayout" name="iconsVerticalLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="preferIconsFromThemeCheckBox">
<property name="text">
<string>Prefer icons from theme over ForkAwesome icons (needs restart to apply)</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="QLabel" name="iconsLabel">
<property name="text">
<string>Icons</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

View File

@ -92,6 +92,7 @@ bool AppearanceOptionPage::apply()
KConfigGroup config = m_applet->config();
config.writeEntry<QSize>("size", QSize(ui()->widthSpinBox->value(), ui()->heightSpinBox->value()));
config.writeEntry<bool>("showTabTexts", ui()->showTabTextsCheckBox->isChecked());
config.writeEntry<bool>("preferIconsFromTheme", ui()->preferIconsFromThemeCheckBox->isChecked());
config.writeEntry("passiveStates", m_passiveStatusSelection.toVariantList());
return true;
@ -104,6 +105,7 @@ void AppearanceOptionPage::reset()
ui()->widthSpinBox->setValue(size.width());
ui()->heightSpinBox->setValue(size.height());
ui()->showTabTextsCheckBox->setChecked(config.readEntry<>("showTabTexts", false));
ui()->preferIconsFromThemeCheckBox->setChecked(config.readEntry<>("preferIconsFromTheme", false));
m_passiveStatusSelection.applyVariantList(config.readEntry("passiveStates", QVariantList()));
}

View File

@ -137,25 +137,30 @@ void SyncthingApplet::init()
connect(&m_theme, &Plasma::Theme::themeChanged, this, &SyncthingApplet::handleThemeChanged);
// restore settings
auto &settings = Settings::values();
Settings::restore();
// initialize systemd service support
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
SyncthingService::setMainInstance(&m_service);
Settings::values().systemd.setupService(m_service);
settings.systemd.setupService(m_service);
connect(&m_service, &SyncthingService::systemdAvailableChanged, this, &SyncthingApplet::handleSystemdStatusChanged);
connect(&m_service, &SyncthingService::stateChanged, this, &SyncthingApplet::handleSystemdStatusChanged);
connect(&m_service, &SyncthingService::errorOccurred, this, &SyncthingApplet::handleSystemdServiceError);
#endif
// load primary connection config
m_currentConnectionConfig = config().readEntry<int>("selectedConfig", 0);
const auto &c = config();
m_currentConnectionConfig = c.readEntry<int>("selectedConfig", 0);
// apply settings and connect according to settings
const auto palette = paletteFromTheme(m_theme);
setBrightColors(isPaletteDark(palette));
IconManager::instance().setPalette(palette);
handleSettingsChanged();
if (c.readEntry<>("preferIconsFromTheme", false)) {
Data::setForkAwesomeThemeOverrides();
}
m_initialized = true;
}
@ -167,7 +172,7 @@ void SyncthingApplet::initEngine(QObject *object)
return;
}
const auto color = m_theme.color(Plasma::Theme::TextColor, Plasma::Theme::NormalColorGroup);
m_imageProvider = new QtForkAwesome::QuickImageProvider(m_iconManager.forkAwesomeRenderer(), color);
m_imageProvider = new QtForkAwesome::QuickImageProvider(QtForkAwesome::Renderer::global(), color);
connect(engine, &QObject::destroyed, this, &SyncthingApplet::handleImageProviderDestroyed); // engine has ownership over image provider
engine->addImageProvider(QStringLiteral("fa"), m_imageProvider);
}
@ -305,7 +310,7 @@ QIcon SyncthingApplet::loadForkAwesomeIcon(const QString &name, int size) const
{
const auto icon = QtForkAwesome::iconFromId(name);
return QtForkAwesome::isIconValid(icon)
? QIcon(IconManager::instance().forkAwesomeRenderer().pixmap(icon, QSize(size, size), QGuiApplication::palette().color(QPalette::WindowText)))
? QIcon(QtForkAwesome::Renderer::global().pixmap(icon, QSize(size, size), QGuiApplication::palette().color(QPalette::WindowText)))
: QIcon();
}

View File

@ -234,6 +234,16 @@
<source>Show tab texts</source>
<translation>Text-Beschriftung der Tab-Buttons</translation>
</message>
<message>
<location filename="../lib/appearanceoptionpage.ui" line="159"/>
<source>Prefer icons from theme over ForkAwesome icons (needs restart to apply)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lib/appearanceoptionpage.ui" line="168"/>
<source>Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Colors</source>
<translation type="vanished">Farben</translation>
@ -254,17 +264,17 @@
<context>
<name>Plasmoid::SettingsDialog</name>
<message>
<location filename="../lib/settingsdialog.cpp" line="126"/>
<location filename="../lib/settingsdialog.cpp" line="128"/>
<source>Plasmoid</source>
<translation></translation>
</message>
<message>
<location filename="../lib/settingsdialog.cpp" line="134"/>
<location filename="../lib/settingsdialog.cpp" line="136"/>
<source>Web view</source>
<translation>Weboberfläche</translation>
</message>
<message>
<location filename="../lib/settingsdialog.cpp" line="140"/>
<location filename="../lib/settingsdialog.cpp" line="142"/>
<source>Extras</source>
<translation></translation>
</message>
@ -285,17 +295,17 @@
<context>
<name>Plasmoid::SyncthingApplet</name>
<message>
<location filename="../lib/syncthingapplet.cpp" line="380"/>
<location filename="../lib/syncthingapplet.cpp" line="385"/>
<source>About</source>
<translation>Über Syncthing Plasmoid</translation>
</message>
<message>
<location filename="../lib/syncthingapplet.cpp" line="392"/>
<location filename="../lib/syncthingapplet.cpp" line="397"/>
<source>New notifications</source>
<translation>Neue Benachrichtigungen</translation>
</message>
<message>
<location filename="../lib/syncthingapplet.cpp" line="550"/>
<location filename="../lib/syncthingapplet.cpp" line="555"/>
<source>D-Bus error - unable to </source>
<translation>D-Bus-Fehler bei Aktion </translation>
</message>

View File

@ -184,6 +184,16 @@
<source>Show tab texts</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lib/appearanceoptionpage.ui" line="159"/>
<source>Prefer icons from theme over ForkAwesome icons (needs restart to apply)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lib/appearanceoptionpage.ui" line="168"/>
<source>Icons</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Plasmoid::Settings</name>
@ -196,17 +206,17 @@
<context>
<name>Plasmoid::SettingsDialog</name>
<message>
<location filename="../lib/settingsdialog.cpp" line="126"/>
<location filename="../lib/settingsdialog.cpp" line="128"/>
<source>Plasmoid</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lib/settingsdialog.cpp" line="134"/>
<location filename="../lib/settingsdialog.cpp" line="136"/>
<source>Web view</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lib/settingsdialog.cpp" line="140"/>
<location filename="../lib/settingsdialog.cpp" line="142"/>
<source>Extras</source>
<translation type="unfinished"></translation>
</message>
@ -227,17 +237,17 @@
<context>
<name>Plasmoid::SyncthingApplet</name>
<message>
<location filename="../lib/syncthingapplet.cpp" line="380"/>
<location filename="../lib/syncthingapplet.cpp" line="385"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lib/syncthingapplet.cpp" line="392"/>
<location filename="../lib/syncthingapplet.cpp" line="397"/>
<source>New notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lib/syncthingapplet.cpp" line="550"/>
<location filename="../lib/syncthingapplet.cpp" line="555"/>
<source>D-Bus error - unable to </source>
<translation type="unfinished"></translation>
</message>

View File

@ -112,7 +112,7 @@ use_syncthingwidgets()
# link against the qtforkawesomeiconengine plugin when it is a static library
include(3rdParty)
find_package(${PACKAGE_NAMESPACE_PREFIX}qtforkawesomeiconengine${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME} 0.0.1 REQUIRED)
find_package(${PACKAGE_NAMESPACE_PREFIX}qtforkawesomeiconengine${CONFIGURATION_PACKAGE_SUFFIX_QTFORKAWESOME} 0.1.0 REQUIRED)
if (NOT QT_FORK_AWESOME_ICON_ENGINE_LIB_IS_SHARED)
use_qt_fork_awesome_icon_engine()
endif ()

View File

@ -6,6 +6,8 @@
#include <syncthingwidgets/misc/syncthinglauncher.h>
#include <syncthingwidgets/settings/settings.h>
#include <syncthingmodel/syncthingicons.h>
#include <syncthingconnector/syncthingprocess.h>
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
#include <syncthingconnector/syncthingservice.h>
@ -215,13 +217,14 @@ int runApplication(int argc, const char *const *argv)
networkAccessManager().setParent(&singleInstance);
QObject::connect(&singleInstance, &SingleInstance::newInstance, &runApplication);
Settings::restore();
Settings::values().qt.apply();
auto &settings = Settings::values();
settings.qt.apply();
qtConfigArgs.applySettings(true);
if (assumeFirstLaunchArg.isPresent()) {
Settings::values().fakeFirstLaunch = true;
settings.fakeFirstLaunch = true;
}
if (wipArg.isPresent()) {
Settings::values().enableWipFeatures = true;
settings.enableWipFeatures = true;
}
LOAD_QT_TRANSLATIONS;
SyncthingLauncher launcher;
@ -229,9 +232,12 @@ int runApplication(int argc, const char *const *argv)
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
SyncthingService service;
SyncthingService::setMainInstance(&service);
Settings::values().systemd.setupService(service);
settings.systemd.setupService(service);
QObject::connect(&service, &SyncthingService::errorOccurred, &handleSystemdServiceError);
#endif
if (settings.icons.preferIconsFromTheme) {
Data::setForkAwesomeThemeOverrides();
}
// init Syncthing Tray and immediately shutdown on failure
if (const auto res = initSyncthingTray(windowedArg.isPresent(), waitForTrayArg.isPresent(), connectionArg)) {

View File

@ -57,7 +57,7 @@ void DevButtonsItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
return;
}
const int buttonY = option.rect.y() + centerObj(option.rect.height(), 16);
IconManager::instance().forkAwesomeRenderer().render(
QtForkAwesome::Renderer::global().render(
index.data(SyncthingDeviceModel::DevicePaused).toBool() ? QtForkAwesome::Icon::Play : QtForkAwesome::Icon::Pause, painter,
QRect(option.rect.right() - 16, buttonY, 16, 16), QGuiApplication::palette().color(QPalette::Text));
}

View File

@ -55,7 +55,7 @@ void DirButtonsItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
const int buttonY = option.rect.y() + centerObj(option.rect.height(), 16);
const bool dirPaused = index.data(SyncthingDirectoryModel::DirectoryPaused).toBool();
const auto iconColor = QGuiApplication::palette().color(QPalette::Text);
auto &forkAwesomeRenderer = IconManager::instance().forkAwesomeRenderer();
auto &forkAwesomeRenderer = QtForkAwesome::Renderer::global();
if (!dirPaused) {
forkAwesomeRenderer.render(QtForkAwesome::Icon::Refresh, painter, QRect(option.rect.right() - 52, buttonY, 16, 16), iconColor);
}

View File

@ -83,7 +83,7 @@ void DownloadItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
if (!index.parent().isValid()) {
buttonY += centerObj(progressBarOption.rect.height(), 16);
}
IconManager::instance().forkAwesomeRenderer().render(
QtForkAwesome::Renderer::global().render(
QtForkAwesome::Icon::Folder, painter, QRect(option.rect.right() - 16, buttonY, 16, 16), QGuiApplication::palette().color(QPalette::Text));
// draw file icon

View File

@ -736,9 +736,8 @@ void TrayWidget::updateTraffic()
const auto colorActive = palette.color(QPalette::WindowText);
const auto colorInactive = QColor((colorActive.red() + colorBackground.red()) / 2, (colorActive.green() + colorBackground.green()) / 2,
(colorActive.blue() + colorBackground.blue()) / 2);
const auto renderIcon = [&size](QtForkAwesome::Icon icon, const QColor &color) {
return IconManager::instance().forkAwesomeRenderer().pixmap(icon, size, color);
};
const auto renderIcon
= [&size](QtForkAwesome::Icon icon, const QColor &color) { return QtForkAwesome::Renderer::global().pixmap(icon, size, color); };
struct {
QPixmap uploadIconActive;
QPixmap uploadIconInactive;

View File

@ -174,8 +174,8 @@
</message>
<message>
<location filename="../gui/traywidget.ui" line="71"/>
<location filename="../gui/traywidget.cpp" line="834"/>
<location filename="../gui/traywidget.cpp" line="876"/>
<location filename="../gui/traywidget.cpp" line="833"/>
<location filename="../gui/traywidget.cpp" line="875"/>
<source>Start</source>
<translation>Spustit</translation>
</message>
@ -382,18 +382,18 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="830"/>
<location filename="../gui/traywidget.cpp" line="870"/>
<location filename="../gui/traywidget.cpp" line="829"/>
<location filename="../gui/traywidget.cpp" line="869"/>
<source>Stop</source>
<translation>Zastavit</translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="831"/>
<location filename="../gui/traywidget.cpp" line="830"/>
<source>Stop Syncthing instance launched via tray icon</source>
<translation>Zastavit instanci Syncthing spuštěnou prostřednictvím ikony v oznamovací oblasti</translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="835"/>
<location filename="../gui/traywidget.cpp" line="834"/>
<source>Start Syncthing with the built-in launcher configured in the settings</source>
<translation>Spustit Syncthing s vestavěným spouštěčem nastaveným v nastaveních</translation>
</message>
@ -401,12 +401,12 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<context>
<name>main</name>
<message>
<location filename="../application/main.cpp" line="58"/>
<location filename="../application/main.cpp" line="60"/>
<source>Unable to </source>
<translation>Nedaří se </translation>
</message>
<message>
<location filename="../application/main.cpp" line="91"/>
<location filename="../application/main.cpp" line="93"/>
<source>The system tray is (currently) not available. You could open the tray menu as a regular window using the --windowed flag, though.It is also possible to start Syncthing Tray with --wait to wait until the system tray becomes available instead of showing this message.</source>
<translation>Oznamovací oblast systémového panelu je (pro tuto chvíli) nedostupná. Je možné otevřít nabídku oznamovací oblasti jako běžné okno pomocí příznaku --windowed. Dále je možné spustit s volbou --wait a čekat na to, bude oznamovací oblast k dispozici (namísto zobrazení této zprávy).</translation>
</message>
@ -419,7 +419,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<translation type="vanished">Poznamenejme, že dialog nastavení umožňuje importovat URL adresu, přihlašovací údaje a klíč k API z místního nastavení Syncthing.</translation>
</message>
<message>
<location filename="../application/main.cpp" line="118"/>
<location filename="../application/main.cpp" line="120"/>
<source>The Qt libraries have not been built with tray icon support. You could open the tray menu as a regular window using the -w flag, though.</source>
<translation>Knihovny Qt byly sestaveny bez podpory pro ikonu v oznamovací oblasti. Měli byste otevřít nabídku pro oznamovací oblast jako běžné okno pomocí příznaku -w.</translation>
</message>

View File

@ -174,8 +174,8 @@
</message>
<message>
<location filename="../gui/traywidget.ui" line="71"/>
<location filename="../gui/traywidget.cpp" line="834"/>
<location filename="../gui/traywidget.cpp" line="876"/>
<location filename="../gui/traywidget.cpp" line="833"/>
<location filename="../gui/traywidget.cpp" line="875"/>
<source>Start</source>
<translation>Starten</translation>
</message>
@ -383,18 +383,18 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<translation>Verzeichnis-ID kopieren</translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="830"/>
<location filename="../gui/traywidget.cpp" line="870"/>
<location filename="../gui/traywidget.cpp" line="829"/>
<location filename="../gui/traywidget.cpp" line="869"/>
<source>Stop</source>
<translation>Stoppen</translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="831"/>
<location filename="../gui/traywidget.cpp" line="830"/>
<source>Stop Syncthing instance launched via tray icon</source>
<translation>Stoppe Syncthing-Instanz, die mit dem internen Starter gestartet wurde</translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="835"/>
<location filename="../gui/traywidget.cpp" line="834"/>
<source>Start Syncthing with the built-in launcher configured in the settings</source>
<translation>Starte Syncthing mit dem eingebauten Starter, der in den Einstellungen konfiguriert wird</translation>
</message>
@ -402,12 +402,12 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<context>
<name>main</name>
<message>
<location filename="../application/main.cpp" line="58"/>
<location filename="../application/main.cpp" line="60"/>
<source>Unable to </source>
<translation>Fehler beim </translation>
</message>
<message>
<location filename="../application/main.cpp" line="91"/>
<location filename="../application/main.cpp" line="93"/>
<source>The system tray is (currently) not available. You could open the tray menu as a regular window using the --windowed flag, though.It is also possible to start Syncthing Tray with --wait to wait until the system tray becomes available instead of showing this message.</source>
<translation>Das System-Tray bzw. der Infobereich ist aktuell nicht verfügbar. Mit der Option &quot;--windowed&quot; ist es möglich, Syncthing Tray als normales Fenster zu starten. Außerdem ist es möglich mit der Option &quot;--wait&quot; zu warten bis das System-Tray verfügbar ist anstelle diesen Dialog zu zeigen.</translation>
</message>
@ -420,7 +420,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<translation type="vanished">Der Einstellungsdialog ermöglicht es die URL, Zugangsdaten und den API-Key automatisch aus der lokalen Syncthing-Konfiguration auszulesen.</translation>
</message>
<message>
<location filename="../application/main.cpp" line="118"/>
<location filename="../application/main.cpp" line="120"/>
<source>The Qt libraries have not been built with tray icon support. You could open the tray menu as a regular window using the -w flag, though.</source>
<translation>Die verwendete Qt-Bibliothek wurde nicht mit Unterstützung für System-Tray konfiguriert. Es wäre möglich, Syncthing Tray als normales Fenster zu starten (mit Option -w).</translation>
</message>

View File

@ -174,8 +174,8 @@
</message>
<message>
<location filename="../gui/traywidget.ui" line="71"/>
<location filename="../gui/traywidget.cpp" line="834"/>
<location filename="../gui/traywidget.cpp" line="876"/>
<location filename="../gui/traywidget.cpp" line="833"/>
<location filename="../gui/traywidget.cpp" line="875"/>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
@ -381,18 +381,18 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="830"/>
<location filename="../gui/traywidget.cpp" line="870"/>
<location filename="../gui/traywidget.cpp" line="829"/>
<location filename="../gui/traywidget.cpp" line="869"/>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="831"/>
<location filename="../gui/traywidget.cpp" line="830"/>
<source>Stop Syncthing instance launched via tray icon</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="835"/>
<location filename="../gui/traywidget.cpp" line="834"/>
<source>Start Syncthing with the built-in launcher configured in the settings</source>
<translation type="unfinished"></translation>
</message>
@ -400,17 +400,17 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<context>
<name>main</name>
<message>
<location filename="../application/main.cpp" line="58"/>
<location filename="../application/main.cpp" line="60"/>
<source>Unable to </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/main.cpp" line="91"/>
<location filename="../application/main.cpp" line="93"/>
<source>The system tray is (currently) not available. You could open the tray menu as a regular window using the --windowed flag, though.It is also possible to start Syncthing Tray with --wait to wait until the system tray becomes available instead of showing this message.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/main.cpp" line="118"/>
<location filename="../application/main.cpp" line="120"/>
<source>The Qt libraries have not been built with tray icon support. You could open the tray menu as a regular window using the -w flag, though.</source>
<translation type="unfinished"></translation>
</message>

View File

@ -168,8 +168,8 @@
</message>
<message>
<location filename="../gui/traywidget.ui" line="71"/>
<location filename="../gui/traywidget.cpp" line="834"/>
<location filename="../gui/traywidget.cpp" line="876"/>
<location filename="../gui/traywidget.cpp" line="833"/>
<location filename="../gui/traywidget.cpp" line="875"/>
<source>Start</source>
<translation></translation>
</message>
@ -382,18 +382,18 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="830"/>
<location filename="../gui/traywidget.cpp" line="870"/>
<location filename="../gui/traywidget.cpp" line="829"/>
<location filename="../gui/traywidget.cpp" line="869"/>
<source>Stop</source>
<translation></translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="831"/>
<location filename="../gui/traywidget.cpp" line="830"/>
<source>Stop Syncthing instance launched via tray icon</source>
<translation> Syncthing </translation>
</message>
<message>
<location filename="../gui/traywidget.cpp" line="835"/>
<location filename="../gui/traywidget.cpp" line="834"/>
<source>Start Syncthing with the built-in launcher configured in the settings</source>
<translation>使 Syncthing</translation>
</message>
@ -401,12 +401,12 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<context>
<name>main</name>
<message>
<location filename="../application/main.cpp" line="58"/>
<location filename="../application/main.cpp" line="60"/>
<source>Unable to </source>
<translation> </translation>
</message>
<message>
<location filename="../application/main.cpp" line="91"/>
<location filename="../application/main.cpp" line="93"/>
<source>The system tray is (currently) not available. You could open the tray menu as a regular window using the --windowed flag, though.It is also possible to start Syncthing Tray with --wait to wait until the system tray becomes available instead of showing this message.</source>
<translation>使 --windowed 使 --wait Syncthing Tray </translation>
</message>
@ -419,7 +419,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</source>
<translation type="vanished"> Syncthing URL API </translation>
</message>
<message>
<location filename="../application/main.cpp" line="118"/>
<location filename="../application/main.cpp" line="120"/>
<source>The Qt libraries have not been built with tray icon support. You could open the tray menu as a regular window using the -w flag, though.</source>
<translation>Qt 使使 -w </translation>
</message>

View File

@ -219,7 +219,7 @@
</property>
</widget>
</item>
<item row="9" column="0">
<item row="11" column="0">
<widget class="QLabel" name="positioningLabel">
<property name="text">
<string>Positioning</string>
@ -229,7 +229,7 @@
</property>
</widget>
</item>
<item row="9" column="1">
<item row="11" column="1">
<layout class="QVBoxLayout" name="positioningVerticalLayout">
<item>
<widget class="QCheckBox" name="useCursorPosCheckBox">
@ -338,6 +338,27 @@
</item>
</layout>
</item>
<item row="9" column="1">
<layout class="QVBoxLayout" name="iconsVerticalLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="preferIconsFromThemeCheckBox">
<property name="text">
<string>Prefer icons from theme over ForkAwesome icons (needs restart to apply)</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="9" column="0">
<widget class="QLabel" name="iconsLabel">
<property name="text">
<string>Icons</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>

View File

@ -345,6 +345,7 @@ void restore()
v.icons.status.renderSize = settings.value(QStringLiteral("statusIconsRenderSize"), v.icons.status.renderSize).toSize();
v.icons.tray.renderSize = settings.value(QStringLiteral("trayIconsRenderSize"), v.icons.tray.renderSize).toSize();
v.icons.distinguishTrayIcons = settings.value(QStringLiteral("distinguishTrayIcons")).toBool();
v.icons.preferIconsFromTheme = settings.value(QStringLiteral("preferIconsFromTheme")).toBool();
settings.beginGroup(QStringLiteral("positioning"));
auto &positioning = appearance.positioning;
positioning.useCursorPosition = settings.value(QStringLiteral("useCursorPos"), positioning.useCursorPosition).toBool();
@ -456,6 +457,7 @@ void save()
settings.setValue(QStringLiteral("statusIconsRenderSize"), v.icons.status.renderSize);
settings.setValue(QStringLiteral("trayIconsRenderSize"), v.icons.tray.renderSize);
settings.setValue(QStringLiteral("distinguishTrayIcons"), v.icons.distinguishTrayIcons);
settings.setValue(QStringLiteral("preferIconsFromTheme"), v.icons.preferIconsFromTheme);
settings.beginGroup(QStringLiteral("positioning"));
settings.setValue(QStringLiteral("useCursorPos"), appearance.positioning.useCursorPosition);
settings.setValue(QStringLiteral("assumedIconPos"), appearance.positioning.assumedIconPosition);

View File

@ -167,6 +167,7 @@ struct SYNCTHINGWIDGETS_EXPORT Settings {
Data::StatusIconSettings status;
Data::StatusIconSettings tray;
bool distinguishTrayIcons = false;
bool preferIconsFromTheme = false;
} icons;
Launcher launcher;
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD

View File

@ -461,11 +461,13 @@ AppearanceOptionPage::~AppearanceOptionPage()
bool AppearanceOptionPage::apply()
{
auto &settings = values().appearance;
auto &v = values();
auto &settings = v.appearance;
settings.trayMenuSize.setWidth(ui()->widthSpinBox->value());
settings.trayMenuSize.setHeight(ui()->heightSpinBox->value());
settings.showTraffic = ui()->showTrafficCheckBox->isChecked();
settings.showTabTexts = ui()->showTabTextsCheckBox->isChecked();
v.icons.preferIconsFromTheme = ui()->preferIconsFromThemeCheckBox->isChecked();
int style;
switch (ui()->frameShapeComboBox->currentIndex()) {
case 0:
@ -500,11 +502,13 @@ bool AppearanceOptionPage::apply()
void AppearanceOptionPage::reset()
{
const auto &settings = values().appearance;
const auto &v = values();
const auto &settings = v.appearance;
ui()->widthSpinBox->setValue(settings.trayMenuSize.width());
ui()->heightSpinBox->setValue(settings.trayMenuSize.height());
ui()->showTrafficCheckBox->setChecked(settings.showTraffic);
ui()->showTabTextsCheckBox->setChecked(settings.showTabTexts);
ui()->preferIconsFromThemeCheckBox->setChecked(v.icons.preferIconsFromTheme);
int index;
switch (settings.frameStyle & QFrame::Shape_Mask) {
case QFrame::NoFrame:

View File

@ -144,6 +144,16 @@
<source>Show tab texts</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/appearanceoptionpage.ui" line="349"/>
<source>Prefer icons from theme over ForkAwesome icons (needs restart to apply)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/appearanceoptionpage.ui" line="358"/>
<source>Icons</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtGui::ApplyWizardPage</name>
@ -291,27 +301,27 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="728"/>
<location filename="../settings/settingsdialog.cpp" line="732"/>
<source>This is achieved by adding a *.desktop file under &lt;i&gt;~/.config/autostart&lt;/i&gt; so the setting only affects the current user.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="731"/>
<location filename="../settings/settingsdialog.cpp" line="735"/>
<source>This is achieved by adding a registry key under &lt;i&gt;HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run&lt;/i&gt; so the setting only affects the current user. Note that the startup entry is invalidated when moving &lt;i&gt;syncthingtray.exe&lt;/i&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="735"/>
<location filename="../settings/settingsdialog.cpp" line="739"/>
<source>This is achieved by adding a *.plist file under &lt;i&gt;~/Library/LaunchAgents&lt;/i&gt; so the setting only affects the current user.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="739"/>
<location filename="../settings/settingsdialog.cpp" line="743"/>
<source>This feature has not been implemented for your platform (yet).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="870"/>
<location filename="../settings/settingsdialog.cpp" line="874"/>
<source>unable to modify startup entry</source>
<translation type="unfinished"></translation>
</message>
@ -783,47 +793,47 @@
<context>
<name>QtGui::IconsOptionPageBase</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="563"/>
<location filename="../settings/settingsdialog.cpp" line="567"/>
<source>UI icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="569"/>
<location filename="../settings/settingsdialog.cpp" line="573"/>
<source>System icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="565"/>
<location filename="../settings/settingsdialog.cpp" line="569"/>
<source>These icon settings are used within Syncthing Tray&apos;s UI.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="570"/>
<location filename="../settings/settingsdialog.cpp" line="574"/>
<source>These icon settings are used for the system tray icon and the notifications.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="572"/>
<location filename="../settings/settingsdialog.cpp" line="576"/>
<source>Use same settings as for UI icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="628"/>
<location filename="../settings/settingsdialog.cpp" line="632"/>
<source>Colorful background with gradient (default)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="633"/>
<location filename="../settings/settingsdialog.cpp" line="637"/>
<source>Transparent background and dark foreground (for bright themes)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="638"/>
<location filename="../settings/settingsdialog.cpp" line="642"/>
<source>Transparent background and bright foreground (for dark themes)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="654"/>
<location filename="../settings/settingsdialog.cpp" line="658"/>
<source>%1 px (scaled to %2 px)</source>
<translation type="unfinished"></translation>
</message>
@ -951,7 +961,7 @@
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="197"/>
<location filename="../settings/settingsdialog.cpp" line="1045"/>
<location filename="../settings/settingsdialog.cpp" line="1049"/>
<source>Stop launched instance</source>
<translation type="unfinished"></translation>
</message>
@ -966,82 +976,82 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="917"/>
<location filename="../settings/settingsdialog.cpp" line="921"/>
<source>%1-launcher</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="918"/>
<location filename="../settings/settingsdialog.cpp" line="922"/>
<source>Launch %1 when starting the tray icon</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="921"/>
<location filename="../settings/settingsdialog.cpp" line="925"/>
<source>%1 executable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="922"/>
<location filename="../settings/settingsdialog.cpp" line="926"/>
<source>%1 log (interleaved stdout/stderr)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="938"/>
<location filename="../settings/settingsdialog.cpp" line="942"/>
<source>Restore default</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="944"/>
<location filename="../settings/settingsdialog.cpp" line="948"/>
<source>Show Syncthing releases/downloads</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1080"/>
<location filename="../settings/settingsdialog.cpp" line="1084"/>
<source>%1 exited with exit code %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1083"/>
<location filename="../settings/settingsdialog.cpp" line="1087"/>
<source>%1 crashed with exit code %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1116"/>
<location filename="../settings/settingsdialog.cpp" line="1120"/>
<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="1119"/>
<location filename="../settings/settingsdialog.cpp" line="1123"/>
<source>process crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1122"/>
<location filename="../settings/settingsdialog.cpp" line="1126"/>
<source>timeout error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1125"/>
<location filename="../settings/settingsdialog.cpp" line="1129"/>
<source>read error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1128"/>
<location filename="../settings/settingsdialog.cpp" line="1132"/>
<source>write error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1131"/>
<location filename="../settings/settingsdialog.cpp" line="1135"/>
<source>unknown process error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1134"/>
<location filename="../settings/settingsdialog.cpp" line="1138"/>
<source>An error occurred when running %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1187"/>
<location filename="../settings/settingsdialog.cpp" line="1191"/>
<source>Kill launched instance</source>
<translation type="unfinished"></translation>
</message>
@ -1253,37 +1263,37 @@
<context>
<name>QtGui::SettingsDialog</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="1430"/>
<location filename="../settings/settingsdialog.cpp" line="1434"/>
<source>Tray</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1437"/>
<location filename="../settings/settingsdialog.cpp" line="1441"/>
<source>Web view</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1444"/>
<location filename="../settings/settingsdialog.cpp" line="1448"/>
<source>Startup</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1446"/>
<location filename="../settings/settingsdialog.cpp" line="1450"/>
<source>additional tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1446"/>
<location filename="../settings/settingsdialog.cpp" line="1450"/>
<source>Extra launcher</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1469"/>
<location filename="../settings/settingsdialog.cpp" line="1473"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1478"/>
<location filename="../settings/settingsdialog.cpp" line="1482"/>
<source>Start wizard</source>
<translation type="unfinished"></translation>
</message>
@ -1443,8 +1453,8 @@ This dialog closes automatically when the process finally terminates.</source>
<location filename="../settings/systemdoptionpage.ui" line="109"/>
<location filename="../settings/systemdoptionpage.ui" line="164"/>
<location filename="../settings/systemdoptionpage.ui" line="253"/>
<location filename="../settings/settingsdialog.cpp" line="1325"/>
<location filename="../settings/settingsdialog.cpp" line="1334"/>
<location filename="../settings/settingsdialog.cpp" line="1329"/>
<location filename="../settings/settingsdialog.cpp" line="1338"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
@ -1484,27 +1494,27 @@ This dialog closes automatically when the process finally terminates.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1223"/>
<location filename="../settings/settingsdialog.cpp" line="1227"/>
<source>Reload all unit files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1261"/>
<location filename="../settings/settingsdialog.cpp" line="1265"/>
<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="1267"/>
<location filename="../settings/settingsdialog.cpp" line="1271"/>
<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="1298"/>
<location filename="../settings/settingsdialog.cpp" line="1302"/>
<source>specified unit is either inactive or doesn&apos;t exist</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1320"/>
<location filename="../settings/settingsdialog.cpp" line="1324"/>
<source>since </source>
<translation type="unfinished"></translation>
</message>
@ -1538,7 +1548,7 @@ This dialog closes automatically when the process finally terminates.</source>
<name>QtGui::WebViewOptionPage</name>
<message>
<location filename="../settings/webviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1377"/>
<location filename="../settings/settingsdialog.cpp" line="1381"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
@ -1568,7 +1578,7 @@ This dialog closes automatically when the process finally terminates.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1379"/>
<location filename="../settings/settingsdialog.cpp" line="1383"/>
<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>
<translation type="unfinished"></translation>
@ -1823,7 +1833,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="600"/>
<location filename="../settings/settings.cpp" line="603"/>
<source>Backup of %1 (created by wizard)</source>
<translation type="unfinished"></translation>
</message>

View File

@ -216,6 +216,16 @@
<source>Show tab texts</source>
<translation>Text-Beschriftung der Tab-Buttons</translation>
</message>
<message>
<location filename="../settings/appearanceoptionpage.ui" line="349"/>
<source>Prefer icons from theme over ForkAwesome icons (needs restart to apply)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/appearanceoptionpage.ui" line="358"/>
<source>Icons</source>
<translation type="unfinished">Symbole</translation>
</message>
<message>
<source>Colors</source>
<translation type="vanished">Farben</translation>
@ -386,27 +396,27 @@
<translation>Tray-Icon beim Starten der Desktopumgebung automatisch starten</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="728"/>
<location filename="../settings/settingsdialog.cpp" line="732"/>
<source>This is achieved by adding a *.desktop file under &lt;i&gt;~/.config/autostart&lt;/i&gt; so the setting only affects the current user.</source>
<translation>Durch das Hinzufügen einer *.desktop-Datei unter &lt;i&gt;~/.config/autostart&lt;/i&gt; realisiert - betrifft also nur den aktuellen Benutzer.</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="731"/>
<location filename="../settings/settingsdialog.cpp" line="735"/>
<source>This is achieved by adding a registry key under &lt;i&gt;HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run&lt;/i&gt; so the setting only affects the current user. Note that the startup entry is invalidated when moving &lt;i&gt;syncthingtray.exe&lt;/i&gt;.</source>
<translation>Durch das Hinzufügen eines Registry-Schlüssels unter &lt;i&gt;HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run&lt;/i&gt; realisiert - betrifft also nur den aktuellen Benutzer.</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="735"/>
<location filename="../settings/settingsdialog.cpp" line="739"/>
<source>This is achieved by adding a *.plist file under &lt;i&gt;~/Library/LaunchAgents&lt;/i&gt; so the setting only affects the current user.</source>
<translation>Durch das Hinzufügen einer *.plist-Datei unter &lt;i&gt;~/Library/LaunchAgents&lt;/i&gt; realisiert - betrifft also nur den aktuellen Benutzer.</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="739"/>
<location filename="../settings/settingsdialog.cpp" line="743"/>
<source>This feature has not been implemented for your platform (yet).</source>
<translation>Diese Funktion wurde für die aktuelle Plattform nicht nicht implementiert.</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="870"/>
<location filename="../settings/settingsdialog.cpp" line="874"/>
<source>unable to modify startup entry</source>
<translation>Fehler beim aktualisieren des Auto-Start-Eintrags</translation>
</message>
@ -885,7 +895,7 @@
<context>
<name>QtGui::IconsOptionPageBase</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="563"/>
<location filename="../settings/settingsdialog.cpp" line="567"/>
<source>UI icons</source>
<translation>UI-Icons</translation>
</message>
@ -894,7 +904,7 @@
<translation type="vanished">Diese Icon-Farben werden innerhalb der Oberfläche von Syncthing Tray verwendet.</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="569"/>
<location filename="../settings/settingsdialog.cpp" line="573"/>
<source>System icons</source>
<translation>System-Icons</translation>
</message>
@ -907,37 +917,37 @@
<translation type="vanished">Die selben Farben wie für UI-Icons verwenden</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="565"/>
<location filename="../settings/settingsdialog.cpp" line="569"/>
<source>These icon settings are used within Syncthing Tray&apos;s UI.</source>
<translation>Diese Icon-Einstellungen werden innerhalb der Oberfläche von Syncthing Tray verwendet.</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="570"/>
<location filename="../settings/settingsdialog.cpp" line="574"/>
<source>These icon settings are used for the system tray icon and the notifications.</source>
<translation>Diese Icon-Einstellungen werden für das System-Tray-Icon und Benachrichtigungen verwendet.</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="572"/>
<location filename="../settings/settingsdialog.cpp" line="576"/>
<source>Use same settings as for UI icons</source>
<translation>Die selben Einstellungen wie für UI-Icons verwenden</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="628"/>
<location filename="../settings/settingsdialog.cpp" line="632"/>
<source>Colorful background with gradient (default)</source>
<translation>Hintergrund mit Farbverlauf (Standard)</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="633"/>
<location filename="../settings/settingsdialog.cpp" line="637"/>
<source>Transparent background and dark foreground (for bright themes)</source>
<translation>Transparenter Hintergrund und dunkler Vordergrund (für helle Themes)</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="638"/>
<location filename="../settings/settingsdialog.cpp" line="642"/>
<source>Transparent background and bright foreground (for dark themes)</source>
<translation>Transparenter Hintergrund und heller Vordergrund (für dunkle Themes)</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="654"/>
<location filename="../settings/settingsdialog.cpp" line="658"/>
<source>%1 px (scaled to %2 px)</source>
<translation>%1 px (skaliert zu %2 px)</translation>
</message>
@ -1073,7 +1083,7 @@
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="197"/>
<location filename="../settings/settingsdialog.cpp" line="1045"/>
<location filename="../settings/settingsdialog.cpp" line="1049"/>
<source>Stop launched instance</source>
<translation>Stoppen</translation>
</message>
@ -1088,12 +1098,12 @@
<translation>Log folgen</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="917"/>
<location filename="../settings/settingsdialog.cpp" line="921"/>
<source>%1-launcher</source>
<translation>%1-Starter</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="918"/>
<location filename="../settings/settingsdialog.cpp" line="922"/>
<source>Launch %1 when starting the tray icon</source>
<translation>Starte %1 beim Starten des Tray-Icons</translation>
</message>
@ -1102,72 +1112,72 @@
<translation type="obsolete">%1-Starter {1 ?}</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="921"/>
<location filename="../settings/settingsdialog.cpp" line="925"/>
<source>%1 executable</source>
<translation>Ausführbare Datei von %1</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="922"/>
<location filename="../settings/settingsdialog.cpp" line="926"/>
<source>%1 log (interleaved stdout/stderr)</source>
<translation>Log von %1 (stdout/stderr)</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="938"/>
<location filename="../settings/settingsdialog.cpp" line="942"/>
<source>Restore default</source>
<translation>Auf Vorgabe zurücksetzen</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="944"/>
<location filename="../settings/settingsdialog.cpp" line="948"/>
<source>Show Syncthing releases/downloads</source>
<translation>Syncthing Releases/Downloads zeigen</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1080"/>
<location filename="../settings/settingsdialog.cpp" line="1084"/>
<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="1083"/>
<location filename="../settings/settingsdialog.cpp" line="1087"/>
<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="1116"/>
<location filename="../settings/settingsdialog.cpp" line="1120"/>
<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="1119"/>
<location filename="../settings/settingsdialog.cpp" line="1123"/>
<source>process crashed</source>
<translation>Prozess ist abgestürzt</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1122"/>
<location filename="../settings/settingsdialog.cpp" line="1126"/>
<source>timeout error</source>
<translation>Time-out</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1125"/>
<location filename="../settings/settingsdialog.cpp" line="1129"/>
<source>read error</source>
<translation>Lesefehler</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1128"/>
<location filename="../settings/settingsdialog.cpp" line="1132"/>
<source>write error</source>
<translation>Schreibfehler</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1131"/>
<location filename="../settings/settingsdialog.cpp" line="1135"/>
<source>unknown process error</source>
<translation>unbekannter Fehler</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1134"/>
<location filename="../settings/settingsdialog.cpp" line="1138"/>
<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="1187"/>
<location filename="../settings/settingsdialog.cpp" line="1191"/>
<source>Kill launched instance</source>
<translation>Töten</translation>
</message>
@ -1387,12 +1397,12 @@
<context>
<name>QtGui::SettingsDialog</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="1437"/>
<location filename="../settings/settingsdialog.cpp" line="1441"/>
<source>Web view</source>
<translation>Weboberfläche</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1444"/>
<location filename="../settings/settingsdialog.cpp" line="1448"/>
<source>Startup</source>
<translation>Starten</translation>
</message>
@ -1401,27 +1411,27 @@
<translation type="vanished">Zusatztool</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1430"/>
<location filename="../settings/settingsdialog.cpp" line="1434"/>
<source>Tray</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1446"/>
<location filename="../settings/settingsdialog.cpp" line="1450"/>
<source>Extra launcher</source>
<translation>Extra-Starter</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1446"/>
<location filename="../settings/settingsdialog.cpp" line="1450"/>
<source>additional tool</source>
<translation>Zusatztool</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1469"/>
<location filename="../settings/settingsdialog.cpp" line="1473"/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1478"/>
<location filename="../settings/settingsdialog.cpp" line="1482"/>
<source>Start wizard</source>
<translation>Einrichtungsassistenten öffnen</translation>
</message>
@ -1603,8 +1613,8 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<location filename="../settings/systemdoptionpage.ui" line="109"/>
<location filename="../settings/systemdoptionpage.ui" line="164"/>
<location filename="../settings/systemdoptionpage.ui" line="253"/>
<location filename="../settings/settingsdialog.cpp" line="1325"/>
<location filename="../settings/settingsdialog.cpp" line="1334"/>
<location filename="../settings/settingsdialog.cpp" line="1329"/>
<location filename="../settings/settingsdialog.cpp" line="1338"/>
<source>unknown</source>
<translation>unbekannt</translation>
</message>
@ -1638,27 +1648,27 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<translation>Stoppen</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1223"/>
<location filename="../settings/settingsdialog.cpp" line="1227"/>
<source>Reload all unit files</source>
<translation>Alle Unit-Dateien neu laden</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1261"/>
<location filename="../settings/settingsdialog.cpp" line="1265"/>
<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="1267"/>
<location filename="../settings/settingsdialog.cpp" line="1271"/>
<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="1298"/>
<location filename="../settings/settingsdialog.cpp" line="1302"/>
<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="1320"/>
<location filename="../settings/settingsdialog.cpp" line="1324"/>
<source>since </source>
<translation>seit </translation>
</message>
@ -1696,7 +1706,7 @@ Dieser Dialog schließt sich automatisch, wenn der Prozess beendet wird.</transl
<name>QtGui::WebViewOptionPage</name>
<message>
<location filename="../settings/webviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1377"/>
<location filename="../settings/settingsdialog.cpp" line="1381"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
@ -1726,7 +1736,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>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1379"/>
<location filename="../settings/settingsdialog.cpp" line="1383"/>
<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>
<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.
@ -1994,7 +2004,7 @@ Die Weboberfläche wird stattdessen im Standardwebrowser geöffnet.</translation
<context>
<name>Settings::Connection</name>
<message>
<location filename="../settings/settings.cpp" line="600"/>
<location filename="../settings/settings.cpp" line="603"/>
<source>Backup of %1 (created by wizard)</source>
<translation type="unfinished"></translation>
</message>

View File

@ -144,6 +144,16 @@
<source>Show tab texts</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/appearanceoptionpage.ui" line="349"/>
<source>Prefer icons from theme over ForkAwesome icons (needs restart to apply)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/appearanceoptionpage.ui" line="358"/>
<source>Icons</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtGui::ApplyWizardPage</name>
@ -291,27 +301,27 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="728"/>
<location filename="../settings/settingsdialog.cpp" line="732"/>
<source>This is achieved by adding a *.desktop file under &lt;i&gt;~/.config/autostart&lt;/i&gt; so the setting only affects the current user.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="731"/>
<location filename="../settings/settingsdialog.cpp" line="735"/>
<source>This is achieved by adding a registry key under &lt;i&gt;HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run&lt;/i&gt; so the setting only affects the current user. Note that the startup entry is invalidated when moving &lt;i&gt;syncthingtray.exe&lt;/i&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="735"/>
<location filename="../settings/settingsdialog.cpp" line="739"/>
<source>This is achieved by adding a *.plist file under &lt;i&gt;~/Library/LaunchAgents&lt;/i&gt; so the setting only affects the current user.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="739"/>
<location filename="../settings/settingsdialog.cpp" line="743"/>
<source>This feature has not been implemented for your platform (yet).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="870"/>
<location filename="../settings/settingsdialog.cpp" line="874"/>
<source>unable to modify startup entry</source>
<translation type="unfinished"></translation>
</message>
@ -782,47 +792,47 @@
<context>
<name>QtGui::IconsOptionPageBase</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="563"/>
<location filename="../settings/settingsdialog.cpp" line="567"/>
<source>UI icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="569"/>
<location filename="../settings/settingsdialog.cpp" line="573"/>
<source>System icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="565"/>
<location filename="../settings/settingsdialog.cpp" line="569"/>
<source>These icon settings are used within Syncthing Tray&apos;s UI.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="570"/>
<location filename="../settings/settingsdialog.cpp" line="574"/>
<source>These icon settings are used for the system tray icon and the notifications.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="572"/>
<location filename="../settings/settingsdialog.cpp" line="576"/>
<source>Use same settings as for UI icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="628"/>
<location filename="../settings/settingsdialog.cpp" line="632"/>
<source>Colorful background with gradient (default)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="633"/>
<location filename="../settings/settingsdialog.cpp" line="637"/>
<source>Transparent background and dark foreground (for bright themes)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="638"/>
<location filename="../settings/settingsdialog.cpp" line="642"/>
<source>Transparent background and bright foreground (for dark themes)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="654"/>
<location filename="../settings/settingsdialog.cpp" line="658"/>
<source>%1 px (scaled to %2 px)</source>
<translation type="unfinished"></translation>
</message>
@ -949,7 +959,7 @@
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="197"/>
<location filename="../settings/settingsdialog.cpp" line="1045"/>
<location filename="../settings/settingsdialog.cpp" line="1049"/>
<source>Stop launched instance</source>
<translation type="unfinished"></translation>
</message>
@ -964,82 +974,82 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="917"/>
<location filename="../settings/settingsdialog.cpp" line="921"/>
<source>%1-launcher</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="918"/>
<location filename="../settings/settingsdialog.cpp" line="922"/>
<source>Launch %1 when starting the tray icon</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="921"/>
<location filename="../settings/settingsdialog.cpp" line="925"/>
<source>%1 executable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="922"/>
<location filename="../settings/settingsdialog.cpp" line="926"/>
<source>%1 log (interleaved stdout/stderr)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="938"/>
<location filename="../settings/settingsdialog.cpp" line="942"/>
<source>Restore default</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="944"/>
<location filename="../settings/settingsdialog.cpp" line="948"/>
<source>Show Syncthing releases/downloads</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1080"/>
<location filename="../settings/settingsdialog.cpp" line="1084"/>
<source>%1 exited with exit code %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1083"/>
<location filename="../settings/settingsdialog.cpp" line="1087"/>
<source>%1 crashed with exit code %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1116"/>
<location filename="../settings/settingsdialog.cpp" line="1120"/>
<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="1119"/>
<location filename="../settings/settingsdialog.cpp" line="1123"/>
<source>process crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1122"/>
<location filename="../settings/settingsdialog.cpp" line="1126"/>
<source>timeout error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1125"/>
<location filename="../settings/settingsdialog.cpp" line="1129"/>
<source>read error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1128"/>
<location filename="../settings/settingsdialog.cpp" line="1132"/>
<source>write error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1131"/>
<location filename="../settings/settingsdialog.cpp" line="1135"/>
<source>unknown process error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1134"/>
<location filename="../settings/settingsdialog.cpp" line="1138"/>
<source>An error occurred when running %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1187"/>
<location filename="../settings/settingsdialog.cpp" line="1191"/>
<source>Kill launched instance</source>
<translation type="unfinished"></translation>
</message>
@ -1251,37 +1261,37 @@
<context>
<name>QtGui::SettingsDialog</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="1430"/>
<location filename="../settings/settingsdialog.cpp" line="1434"/>
<source>Tray</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1437"/>
<location filename="../settings/settingsdialog.cpp" line="1441"/>
<source>Web view</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1444"/>
<location filename="../settings/settingsdialog.cpp" line="1448"/>
<source>Startup</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1446"/>
<location filename="../settings/settingsdialog.cpp" line="1450"/>
<source>additional tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1446"/>
<location filename="../settings/settingsdialog.cpp" line="1450"/>
<source>Extra launcher</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1469"/>
<location filename="../settings/settingsdialog.cpp" line="1473"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1478"/>
<location filename="../settings/settingsdialog.cpp" line="1482"/>
<source>Start wizard</source>
<translation type="unfinished"></translation>
</message>
@ -1445,8 +1455,8 @@ This dialog closes automatically when the process finally terminates.</source>
<location filename="../settings/systemdoptionpage.ui" line="109"/>
<location filename="../settings/systemdoptionpage.ui" line="164"/>
<location filename="../settings/systemdoptionpage.ui" line="253"/>
<location filename="../settings/settingsdialog.cpp" line="1325"/>
<location filename="../settings/settingsdialog.cpp" line="1334"/>
<location filename="../settings/settingsdialog.cpp" line="1329"/>
<location filename="../settings/settingsdialog.cpp" line="1338"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
@ -1486,27 +1496,27 @@ This dialog closes automatically when the process finally terminates.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1223"/>
<location filename="../settings/settingsdialog.cpp" line="1227"/>
<source>Reload all unit files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1261"/>
<location filename="../settings/settingsdialog.cpp" line="1265"/>
<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="1267"/>
<location filename="../settings/settingsdialog.cpp" line="1271"/>
<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="1298"/>
<location filename="../settings/settingsdialog.cpp" line="1302"/>
<source>specified unit is either inactive or doesn&apos;t exist</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1320"/>
<location filename="../settings/settingsdialog.cpp" line="1324"/>
<source>since </source>
<translation type="unfinished"></translation>
</message>
@ -1540,7 +1550,7 @@ This dialog closes automatically when the process finally terminates.</source>
<name>QtGui::WebViewOptionPage</name>
<message>
<location filename="../settings/webviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1377"/>
<location filename="../settings/settingsdialog.cpp" line="1381"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
@ -1570,7 +1580,7 @@ This dialog closes automatically when the process finally terminates.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1379"/>
<location filename="../settings/settingsdialog.cpp" line="1383"/>
<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>
<translation type="unfinished"></translation>
@ -1825,7 +1835,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="600"/>
<location filename="../settings/settings.cpp" line="603"/>
<source>Backup of %1 (created by wizard)</source>
<translation type="unfinished"></translation>
</message>

View File

@ -91,6 +91,16 @@
<source>Show tab texts</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/appearanceoptionpage.ui" line="349"/>
<source>Prefer icons from theme over ForkAwesome icons (needs restart to apply)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/appearanceoptionpage.ui" line="358"/>
<source>Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Colors</source>
<translation type="vanished"></translation>
@ -299,27 +309,27 @@
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="728"/>
<location filename="../settings/settingsdialog.cpp" line="732"/>
<source>This is achieved by adding a *.desktop file under &lt;i&gt;~/.config/autostart&lt;/i&gt; so the setting only affects the current user.</source>
<translation> &lt;i&gt;~/.config/autostart&lt;/i&gt; *.desktop </translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="731"/>
<location filename="../settings/settingsdialog.cpp" line="735"/>
<source>This is achieved by adding a registry key under &lt;i&gt;HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run&lt;/i&gt; so the setting only affects the current user. Note that the startup entry is invalidated when moving &lt;i&gt;syncthingtray.exe&lt;/i&gt;.</source>
<translation> &lt;i&gt;HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run&lt;/i&gt; 下添加注册表项来实现的,因此该设置仅影响当前用户。 请注意,移动 &lt;i&gt;syncthingtray.exe&lt;/i&gt; </translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="735"/>
<location filename="../settings/settingsdialog.cpp" line="739"/>
<source>This is achieved by adding a *.plist file under &lt;i&gt;~/Library/LaunchAgents&lt;/i&gt; so the setting only affects the current user.</source>
<translation> &lt;i&gt;~/Library/LaunchAgents&lt;/i&gt; *.plist </translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="739"/>
<location filename="../settings/settingsdialog.cpp" line="743"/>
<source>This feature has not been implemented for your platform (yet).</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="870"/>
<location filename="../settings/settingsdialog.cpp" line="874"/>
<source>unable to modify startup entry</source>
<translation></translation>
</message>
@ -793,47 +803,47 @@
<context>
<name>QtGui::IconsOptionPageBase</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="563"/>
<location filename="../settings/settingsdialog.cpp" line="567"/>
<source>UI icons</source>
<translation>UI </translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="565"/>
<location filename="../settings/settingsdialog.cpp" line="569"/>
<source>These icon settings are used within Syncthing Tray&apos;s UI.</source>
<translation> Syncthing Tray UI 使</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="569"/>
<location filename="../settings/settingsdialog.cpp" line="573"/>
<source>System icons</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="570"/>
<location filename="../settings/settingsdialog.cpp" line="574"/>
<source>These icon settings are used for the system tray icon and the notifications.</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="572"/>
<location filename="../settings/settingsdialog.cpp" line="576"/>
<source>Use same settings as for UI icons</source>
<translation>使 UI </translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="628"/>
<location filename="../settings/settingsdialog.cpp" line="632"/>
<source>Colorful background with gradient (default)</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="633"/>
<location filename="../settings/settingsdialog.cpp" line="637"/>
<source>Transparent background and dark foreground (for bright themes)</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="638"/>
<location filename="../settings/settingsdialog.cpp" line="642"/>
<source>Transparent background and bright foreground (for dark themes)</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="654"/>
<location filename="../settings/settingsdialog.cpp" line="658"/>
<source>%1 px (scaled to %2 px)</source>
<translation>%1 %2 </translation>
</message>
@ -961,7 +971,7 @@
</message>
<message>
<location filename="../settings/launcheroptionpage.ui" line="197"/>
<location filename="../settings/settingsdialog.cpp" line="1045"/>
<location filename="../settings/settingsdialog.cpp" line="1049"/>
<source>Stop launched instance</source>
<translation></translation>
</message>
@ -976,82 +986,82 @@
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="917"/>
<location filename="../settings/settingsdialog.cpp" line="921"/>
<source>%1-launcher</source>
<translation>%1-</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="918"/>
<location filename="../settings/settingsdialog.cpp" line="922"/>
<source>Launch %1 when starting the tray icon</source>
<translation> %1</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="921"/>
<location filename="../settings/settingsdialog.cpp" line="925"/>
<source>%1 executable</source>
<translation>%1 </translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="922"/>
<location filename="../settings/settingsdialog.cpp" line="926"/>
<source>%1 log (interleaved stdout/stderr)</source>
<translation>%1 /</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="938"/>
<location filename="../settings/settingsdialog.cpp" line="942"/>
<source>Restore default</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="944"/>
<location filename="../settings/settingsdialog.cpp" line="948"/>
<source>Show Syncthing releases/downloads</source>
<translation> Syncthing /</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1080"/>
<location filename="../settings/settingsdialog.cpp" line="1084"/>
<source>%1 exited with exit code %2</source>
<translation>%1 退退 %2</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1083"/>
<location filename="../settings/settingsdialog.cpp" line="1087"/>
<source>%1 crashed with exit code %2</source>
<translation>%1 退 %2</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1116"/>
<location filename="../settings/settingsdialog.cpp" line="1120"/>
<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="1119"/>
<location filename="../settings/settingsdialog.cpp" line="1123"/>
<source>process crashed</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1122"/>
<location filename="../settings/settingsdialog.cpp" line="1126"/>
<source>timeout error</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1125"/>
<location filename="../settings/settingsdialog.cpp" line="1129"/>
<source>read error</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1128"/>
<location filename="../settings/settingsdialog.cpp" line="1132"/>
<source>write error</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1131"/>
<location filename="../settings/settingsdialog.cpp" line="1135"/>
<source>unknown process error</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1134"/>
<location filename="../settings/settingsdialog.cpp" line="1138"/>
<source>An error occurred when running %1: %2</source>
<translation> %1 : %2</translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1187"/>
<location filename="../settings/settingsdialog.cpp" line="1191"/>
<source>Kill launched instance</source>
<translation></translation>
</message>
@ -1271,37 +1281,37 @@
<context>
<name>QtGui::SettingsDialog</name>
<message>
<location filename="../settings/settingsdialog.cpp" line="1430"/>
<location filename="../settings/settingsdialog.cpp" line="1434"/>
<source>Tray</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1437"/>
<location filename="../settings/settingsdialog.cpp" line="1441"/>
<source>Web view</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1444"/>
<location filename="../settings/settingsdialog.cpp" line="1448"/>
<source>Startup</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1446"/>
<location filename="../settings/settingsdialog.cpp" line="1450"/>
<source>additional tool</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1446"/>
<location filename="../settings/settingsdialog.cpp" line="1450"/>
<source>Extra launcher</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1469"/>
<location filename="../settings/settingsdialog.cpp" line="1473"/>
<source>Settings</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1478"/>
<location filename="../settings/settingsdialog.cpp" line="1482"/>
<source>Start wizard</source>
<translation type="unfinished"></translation>
</message>
@ -1478,8 +1488,8 @@ This dialog closes automatically when the process finally terminates.</source>
<location filename="../settings/systemdoptionpage.ui" line="109"/>
<location filename="../settings/systemdoptionpage.ui" line="164"/>
<location filename="../settings/systemdoptionpage.ui" line="253"/>
<location filename="../settings/settingsdialog.cpp" line="1325"/>
<location filename="../settings/settingsdialog.cpp" line="1334"/>
<location filename="../settings/settingsdialog.cpp" line="1329"/>
<location filename="../settings/settingsdialog.cpp" line="1338"/>
<source>unknown</source>
<translation></translation>
</message>
@ -1514,27 +1524,27 @@ This dialog closes automatically when the process finally terminates.</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1223"/>
<location filename="../settings/settingsdialog.cpp" line="1227"/>
<source>Reload all unit files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1261"/>
<location filename="../settings/settingsdialog.cpp" line="1265"/>
<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="1267"/>
<location filename="../settings/settingsdialog.cpp" line="1271"/>
<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="1298"/>
<location filename="../settings/settingsdialog.cpp" line="1302"/>
<source>specified unit is either inactive or doesn&apos;t exist</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1320"/>
<location filename="../settings/settingsdialog.cpp" line="1324"/>
<source>since </source>
<translation> </translation>
</message>
@ -1572,7 +1582,7 @@ This dialog closes automatically when the process finally terminates.</source>
<name>QtGui::WebViewOptionPage</name>
<message>
<location filename="../settings/webviewoptionpage.ui" line="12"/>
<location filename="../settings/settingsdialog.cpp" line="1377"/>
<location filename="../settings/settingsdialog.cpp" line="1381"/>
<source>General</source>
<translation></translation>
</message>
@ -1602,7 +1612,7 @@ This dialog closes automatically when the process finally terminates.</source>
<translation></translation>
</message>
<message>
<location filename="../settings/settingsdialog.cpp" line="1379"/>
<location filename="../settings/settingsdialog.cpp" line="1383"/>
<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>
<translation>Syncthing Tray 使 Qt WebKit Qt WebEngine
@ -1858,7 +1868,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="600"/>
<location filename="../settings/settings.cpp" line="603"/>
<source>Backup of %1 (created by wizard)</source>
<translation type="unfinished"></translation>
</message>