diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 95b71918d8ad7..6ffae4d68a159 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -16,6 +16,12 @@ jobs:
cd doc
make html > build.log 2>&1
if grep WARNING build.log; then
+ grep WARNING build.log | awk '{
+ split($0, fields, ":");
+ sub("/__w/desktop/desktop/", "", fields[1]);
+ print "::warning file=" fields[1] ( length(fields[2]) ? ",line=" fields[2] : "" ) ",title=Documentation generation::" substr($0, index($0, fields[4]) + 1)
+ }'
+
exit 1
else
exit 0
diff --git a/admin/osx/mac-crafter/Sources/Utils/Codesign.swift b/admin/osx/mac-crafter/Sources/Utils/Codesign.swift
index f262ff39d7bac..1f43d3e49aed7 100644
--- a/admin/osx/mac-crafter/Sources/Utils/Codesign.swift
+++ b/admin/osx/mac-crafter/Sources/Utils/Codesign.swift
@@ -126,17 +126,31 @@ func codesignClientAppBundle(
// We need to strip these out manually.
let sparkleFrameworkPath = "\(frameworksPath)/Sparkle.framework"
- if FileManager.default.fileExists(atPath: "\(sparkleFrameworkPath)/Resources/Autoupdate.app") {
- print("Code-signing Sparkle autoupdater app (without entitlements)...")
-
- try recursivelyCodesign(
- path: "\(sparkleFrameworkPath)/Resources/Autoupdate.app",
+ if FileManager.default.fileExists(atPath: sparkleFrameworkPath) {
+ print("Code-signing Sparkle...")
+ try codesign(
identity: codeSignIdentity,
- options: "--timestamp --force --verbose=4 --options runtime --deep"
+ path: "\(sparkleFrameworkPath)/Versions/B/XPCServices/Installer.xpc",
+ options: "-f -o runtime"
+ )
+ try codesign(
+ identity: codeSignIdentity,
+ path: "\(sparkleFrameworkPath)/Versions/B/XPCServices/Downloader.xpc",
+ options: "-f -o runtime --preserve-metadata=entitlements"
+ )
+ try codesign(
+ identity: codeSignIdentity,
+ path: "\(sparkleFrameworkPath)/Versions/B/Autoupdate",
+ options: "-f -o runtime"
+ )
+ try codesign(
+ identity: codeSignIdentity,
+ path: "\(sparkleFrameworkPath)/Versions/B/Updater.app",
+ options: "-f -o runtime"
+ )
+ try codesign(
+ identity: codeSignIdentity, path: sparkleFrameworkPath, options: "-f -o runtime"
)
-
- print("Re-codesigning Sparkle library...")
- try codesign(identity: codeSignIdentity, path: "\(sparkleFrameworkPath)/Sparkle")
} else {
print("Build does not have Sparkle, skipping.")
}
diff --git a/admin/osx/mac-crafter/Sources/main.swift b/admin/osx/mac-crafter/Sources/main.swift
index 654954ec965c0..f7d723b80e3ad 100644
--- a/admin/osx/mac-crafter/Sources/main.swift
+++ b/admin/osx/mac-crafter/Sources/main.swift
@@ -60,7 +60,7 @@ struct Build: ParsableCommand {
@Option(name: [.long], help: "Sparkle download URL.")
var sparkleDownloadUrl =
- "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz"
+ "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz"
@Option(name: [.long], help: "Git clone command; include options such as depth.")
var gitCloneCommand = "git clone --depth=1"
diff --git a/doc/macosvfs.rst b/doc/macosvfs.rst
index 70495fa45e4fb..32da58c9a1106 100644
--- a/doc/macosvfs.rst
+++ b/doc/macosvfs.rst
@@ -6,7 +6,7 @@ macOS Virtual Files
.. index:: macosvfs
-macOS Vitual Files client
+macOS Virtual Files client
============
Virtual file-based synchronisation for Nextcloud desktop users is now
diff --git a/resources.qrc b/resources.qrc
index 9d1da12609314..19994e2962f1f 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -5,7 +5,6 @@
src/gui/EmojiPicker.qml
src/gui/UserStatusSelectorButton.qml
src/gui/PredefinedStatusButton.qml
- src/gui/BasicComboBox.qml
src/gui/ErrorBox.qml
src/gui/filedetails/FileActivityView.qml
src/gui/filedetails/FileDetailsPage.qml
diff --git a/src/gui/BasicComboBox.qml b/src/gui/BasicComboBox.qml
deleted file mode 100644
index a890adeaf665e..0000000000000
--- a/src/gui/BasicComboBox.qml
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2022 by Claudio Cambra
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt5Compat.GraphicalEffects
-
-import Style
-import "./tray"
-
-ComboBox {
- id: clearComboBox
-
- topPadding: Style.smallSpacing + topInset
- leftPadding: Style.smallSpacing + leftInset
- rightPadding: Style.smallSpacing + rightInset
- bottomPadding: Style.smallSpacing + bottomInset
-
- background: Rectangle {
- radius: Style.slightlyRoundedButtonRadius
- color: palette.button
- opacity: clearComboBox.hovered ? Style.hoverOpacity : 1.0
- }
-
- contentItem: EnforcedPlainTextLabel {
- leftPadding: clearComboBox.leftPadding
- rightPadding: clearComboBox.indicator.width + clearComboBox.spacing
-
- text: clearComboBox.displayText
- verticalAlignment: Text.AlignVCenter
- elide: Text.ElideRight
- }
-
- indicator: ColorOverlay {
- anchors.right: clearComboBox.right
- anchors.rightMargin: clearComboBox.rightPadding
- anchors.verticalCenter: clearComboBox.verticalCenter
-
- cached: true
- width: source.width
- height: source.height
-
- source: Image {
- horizontalAlignment: Qt.AlignRight
- verticalAlignment: Qt.AlignVCenter
- source: "image://svgimage-custom-color/caret-down.svg/" + palette.windowText
- sourceSize.width: Style.accountDropDownCaretSize
- sourceSize.height: Style.accountDropDownCaretSize
- Accessible.role: Accessible.PopupMenu
- Accessible.name: qsTr("Clear status message menu")
- }
- }
-
- popup: Popup {
- y: clearComboBox.height - Style.normalBorderWidth
- width: clearComboBox.width
- implicitHeight: contentItem.implicitHeight
- padding: Style.normalBorderWidth
-
- contentItem: ListView {
- clip: true
- implicitHeight: contentHeight
- model: clearComboBox.popup.visible ? clearComboBox.delegateModel : null
- currentIndex: clearComboBox.highlightedIndex
-
- ScrollIndicator.vertical: ScrollIndicator { }
- }
-
- background: Rectangle {
- color: palette.toolTipBase
- border.color: palette.dark
- radius: Style.slightlyRoundedButtonRadius
- }
- }
-
-
- delegate: ItemDelegate {
- id: clearStatusDelegate
- width: clearComboBox.width
- contentItem: EnforcedPlainTextLabel {
- text: modelData.display
- elide: Text.ElideRight
- verticalAlignment: Text.AlignVCenter
- }
- highlighted: clearComboBox.highlightedIndex === index
- }
-}
diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml
index 3e303b469bee6..9ce7043d0cea6 100644
--- a/src/gui/UserStatusSelector.qml
+++ b/src/gui/UserStatusSelector.qml
@@ -293,7 +293,7 @@ ColumnLayout {
wrapMode: Text.Wrap
}
- BasicComboBox {
+ ComboBox {
id: clearComboBox
Layout.fillWidth: true
diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml
index 1ac69e1b38cbe..2b2eb0b45ef15 100644
--- a/src/gui/filedetails/ShareDetailsPage.qml
+++ b/src/gui/filedetails/ShareDetailsPage.qml
@@ -466,7 +466,7 @@ Page {
checkable: true
checked: root.passwordProtectEnabled
- text: qsTr("Password protect")
+ text: qsTr("Password protection")
visible: root.shareSupportsPassword
enabled: visible &&
!root.waitingForPasswordProtectEnabledChange &&
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 7323a8d5b4a8a..53b97c11331d8 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -319,6 +319,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()
if (!Mac::FileProviderSettingsController::instance()->vfsEnabledForAccount(accountFpId)) {
continue;
}
+ allPaused = false;
const auto fileProvider = Mac::FileProvider::instance();
if (!fileProvider->xpc()->fileProviderExtReachable(accountFpId)) {
diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index 8074a4b7977b7..3c28aca043d09 100644
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -588,11 +588,18 @@ void Systray::setSyncIsPaused(const bool syncIsPaused)
void Systray::positionWindowAtTray(QQuickWindow *window) const
{
- if (!useNormalWindow()) {
- window->setScreen(currentScreen());
- const auto position = computeWindowPosition(window->width(), window->height());
- window->setPosition(position);
+ if (useNormalWindow()) {
+ return;
}
+
+ // need to store the current window size before moving the window to another screen,
+ // otherwise it is being incorrectly resized by the OS or Qt when switching to a screen
+ // with a different DPI setting
+ const auto initialSize = window->size();
+ const auto position = computeWindowPosition(initialSize.width(), initialSize.height());
+ window->setPosition(position);
+ window->setScreen(currentScreen());
+ window->resize(initialSize);
}
void Systray::positionWindowAtScreenCenter(QQuickWindow *window) const
diff --git a/src/gui/updater/sparkleupdater_mac.mm b/src/gui/updater/sparkleupdater_mac.mm
index 062ca31a3db33..ef167d95551e8 100644
--- a/src/gui/updater/sparkleupdater_mac.mm
+++ b/src/gui/updater/sparkleupdater_mac.mm
@@ -15,7 +15,6 @@
#include
#include
-#include
#include
#include "common/utility.h"
@@ -34,7 +33,7 @@ explicit SparkleInterface(SparkleUpdater *parent)
~SparkleInterface()
{
- [updater release];
+ [updaterController release];
[delegate release];
}
@@ -45,7 +44,7 @@ void statusChanged(const OCC::SparkleUpdater::State state, const QString &status
emit q->statusChanged();
}
- SUUpdater* updater;
+ SPUStandardUpdaterController *updaterController;
NCSparkleUpdaterDelegate *delegate;
private:
@@ -53,12 +52,12 @@ void statusChanged(const OCC::SparkleUpdater::State state, const QString &status
};
-@interface NCSparkleUpdaterDelegate : NSObject
+@interface NCSparkleUpdaterDelegate : NSObject
@property (readwrite, assign) OCC::SparkleUpdater::SparkleInterface *owner;
+@property (readwrite, retain) NSString *feedURLString;
- (instancetype)initWithOwner:(OCC::SparkleUpdater::SparkleInterface *)owner;
-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle;
@end
@@ -75,21 +74,15 @@ - (instancetype)initWithOwner:(OCC::SparkleUpdater::SparkleInterface *)owner
- (BOOL)backgroundUpdateChecksAllowed
{
- BOOL allowUpdateCheck = OCC::ConfigFile().skipUpdateCheck() ? NO : YES;
+ const BOOL allowUpdateCheck = OCC::ConfigFile().skipUpdateCheck() ? NO : YES;
qCInfo(OCC::lcUpdater) << "Updater may check for updates:" << (allowUpdateCheck ? "YES" : "NO");
return allowUpdateCheck;
}
-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle
-{
- Q_UNUSED(bundle)
- return [self backgroundUpdateChecksAllowed];
-}
-
-- (BOOL)updaterShouldShowUpdateAlertForScheduledUpdate:(SUUpdater *)updater forItem:(SUAppcastItem *)item
+- (BOOL)updater:(nonnull SPUUpdater *)updater mayPerformUpdateCheck:(SPUUpdateCheck)updateCheck error:(NSError **)error
{
Q_UNUSED(updater)
- Q_UNUSED(item)
+ Q_UNUSED(updateCheck)
return [self backgroundUpdateChecksAllowed];
}
@@ -100,12 +93,12 @@ - (void)notifyStateChange:(const OCC::SparkleUpdater::State)state displayStatus:
}
// Sent when a valid update is found by the update driver.
-- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update
+- (void)updater:(nonnull SPUUpdater *)updater didFindValidUpdate:(nonnull SUAppcastItem *)item
{
Q_UNUSED(updater)
- Q_UNUSED(update)
+ Q_UNUSED(item)
- const auto versionQstring = QString::fromNSString(update.displayVersionString);
+ const auto versionQstring = QString::fromNSString(item.displayVersionString);
const auto message = QObject::tr("Found a valid update: version %1", "%1 is version number").arg(versionQstring);
[self notifyStateChange:OCC::SparkleUpdater::State::AwaitingUserInput
@@ -113,7 +106,7 @@ - (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update
}
// Sent when a valid update is not found.
-- (void)updaterDidNotFindUpdate:(SUUpdater *)updater
+- (void)updaterDidNotFindUpdate:(nonnull SPUUpdater *)updater
{
Q_UNUSED(updater)
[self notifyStateChange:OCC::SparkleUpdater::State::Idle
@@ -121,7 +114,7 @@ - (void)updaterDidNotFindUpdate:(SUUpdater *)updater
}
// Sent immediately before installing the specified update.
-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
+- (void)updater:(nonnull SPUUpdater *)updater willInstallUpdate:(nonnull SUAppcastItem *)update
{
Q_UNUSED(updater)
@@ -132,7 +125,7 @@ - (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
displayStatus:message];
}
-- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error
+- (void)updater:(nonnull SPUUpdater *)updater didAbortWithError:(nonnull NSError *)error
{
Q_UNUSED(updater)
@@ -142,7 +135,7 @@ - (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error
displayStatus:message];
}
-- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast
+- (void)updater:(nonnull SPUUpdater *)updater didFinishLoadingAppcast:(nonnull SUAppcast *)appcast
{
Q_UNUSED(updater)
Q_UNUSED(appcast)
@@ -150,30 +143,32 @@ - (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcas
displayStatus:QObject::tr("Finished loading appcast.")];
}
-- (void)updater:(SUUpdater *)updater didDismissUpdateAlertPermanently:(BOOL)permanently forItem:(nonnull SUAppcastItem *)item
-{
- Q_UNUSED(updater)
-
- const auto permanencyString = permanently ? QObject::tr("Permanently") : QObject::tr("Temporarily");
- const auto versionQstring = QString::fromNSString(item.displayVersionString);
- const auto message = QObject::tr("%1 dismissed %2 update", "%1 is permanently or temporarily, %2 is version number").arg(permanencyString, versionQstring);
-
- [self notifyStateChange:OCC::SparkleUpdater::State::Idle
- displayStatus:message];
-}
-
-- (void)updater:(nonnull SUUpdater *)updater userDidSkipThisVersion:(nonnull SUAppcastItem *)item
+- (void)updater:(nonnull SPUUpdater *)updater
+userDidMakeChoice:(SPUUserUpdateChoice)choice
+ forUpdate:(nonnull SUAppcastItem *)item
+ state:(nonnull SPUUserUpdateState *)state
{
Q_UNUSED(updater)
const auto versionQstring = QString::fromNSString(item.displayVersionString);
- const auto message = QObject::tr("Update version %1 will not be applied as it was chosen to be skipped.", "%1 is version number").arg(versionQstring);
+ QString message;
+
+ switch(choice) {
+ case SPUUserUpdateChoiceSkip:
+ message = QObject::tr("Update version %1 will not be applied as it was chosen to be skipped.", "%1 is version number").arg(versionQstring);
+ break;
+ case SPUUserUpdateChoiceInstall:
+ message = QObject::tr("Update version %1 will be installed.", "%1 is version number").arg(versionQstring);
+ break;
+ case SPUUserUpdateChoiceDismiss:
+ message = QObject::tr("Update version %1 will not be applied as it was dismissed.", "%1 is version number").arg(versionQstring);
+ break;
+ }
- [self notifyStateChange:OCC::SparkleUpdater::State::Idle
- displayStatus:message];
+ [self notifyStateChange:OCC::SparkleUpdater::State::Idle displayStatus:message];
}
-- (void)updater:(nonnull SUUpdater *)updater willDownloadUpdate:(nonnull SUAppcastItem *)item withRequest:(nonnull NSMutableURLRequest *)request
+- (void)updater:(nonnull SPUUpdater *)updater willDownloadUpdate:(nonnull SUAppcastItem *)item withRequest:(nonnull NSMutableURLRequest *)request
{
Q_UNUSED(updater)
Q_UNUSED(request)
@@ -185,7 +180,7 @@ - (void)updater:(nonnull SUUpdater *)updater willDownloadUpdate:(nonnull SUAppca
displayStatus:message];
}
-- (void)updater:(nonnull SUUpdater *)updater didDownloadUpdate:(nonnull SUAppcastItem *)item
+- (void)updater:(nonnull SPUUpdater *)updater didDownloadUpdate:(nonnull SUAppcastItem *)item
{
Q_UNUSED(updater)
@@ -196,7 +191,7 @@ - (void)updater:(nonnull SUUpdater *)updater didDownloadUpdate:(nonnull SUAppcas
displayStatus:message];
}
-- (void)updater:(nonnull SUUpdater *)updater failedToDownloadUpdate:(nonnull SUAppcastItem *)item error:(nonnull NSError *)error
+- (void)updater:(nonnull SPUUpdater *)updater failedToDownloadUpdate:(nonnull SUAppcastItem *)item error:(nonnull NSError *)error
{
Q_UNUSED(updater)
@@ -208,7 +203,7 @@ - (void)updater:(nonnull SUUpdater *)updater failedToDownloadUpdate:(nonnull SUA
displayStatus:message];
}
-- (void)updater:(nonnull SUUpdater *)updater willExtractUpdate:(nonnull SUAppcastItem *)item
+- (void)updater:(nonnull SPUUpdater *)updater willExtractUpdate:(nonnull SUAppcastItem *)item
{
Q_UNUSED(updater)
@@ -219,7 +214,7 @@ - (void)updater:(nonnull SUUpdater *)updater willExtractUpdate:(nonnull SUAppcas
displayStatus:message];
}
-- (void)updater:(nonnull SUUpdater *)updater didExtractUpdate:(nonnull SUAppcastItem *)item
+- (void)updater:(nonnull SPUUpdater *)updater didExtractUpdate:(nonnull SUAppcastItem *)item
{
Q_UNUSED(updater)
@@ -230,13 +225,19 @@ - (void)updater:(nonnull SUUpdater *)updater didExtractUpdate:(nonnull SUAppcast
displayStatus:message];
}
-- (void)userDidCancelDownload:(SUUpdater *)updater
+- (void)userDidCancelDownload:(SPUUpdater *)updater
{
Q_UNUSED(updater);
[self notifyStateChange:OCC::SparkleUpdater::State::Idle
displayStatus:QObject::tr("Update download cancelled.")];
}
+- (NSString *)feedURLStringForUpdater:(SPUUpdater *)updater
+{
+ Q_UNUSED(updater)
+ return self.feedURLString;
+}
+
@end
@@ -250,27 +251,25 @@ - (void)userDidCancelDownload:(SUUpdater *)updater
_interface->delegate = [[NCSparkleUpdaterDelegate alloc] initWithOwner:_interface.get()];
[_interface->delegate retain];
- _interface->updater = [SUUpdater sharedUpdater];
- [_interface->updater setDelegate:_interface->delegate];
- [_interface->updater setAutomaticallyChecksForUpdates:YES];
- [_interface->updater setAutomaticallyDownloadsUpdates:NO];
- [_interface->updater setSendsSystemProfile:NO];
- [_interface->updater resetUpdateCycle];
- [_interface->updater retain];
+ _interface->updaterController =
+ [[SPUStandardUpdaterController alloc] initWithStartingUpdater:YES
+ updaterDelegate:_interface->delegate
+ userDriverDelegate:nil];
+ [_interface->updaterController retain];
setUpdateUrl(appCastUrl);
// Sparkle 1.8 required
const auto userAgentString = QString::fromUtf8(Utility::userAgentString());
- NSString *userAgent = userAgentString.toNSString();
- [_interface->updater setUserAgentString: userAgent];
+ NSString *const userAgent = userAgentString.toNSString();
+ _interface->updaterController.updater.userAgentString = userAgent;
}
SparkleUpdater::~SparkleUpdater() = default;
void SparkleUpdater::setUpdateUrl(const QUrl &url)
{
- [_interface->updater setFeedURL:url.toNSURL()];
+ _interface->delegate.feedURLString = url.toNSURL().absoluteString;
}
bool SparkleUpdater::autoUpdaterAllowed()
@@ -295,7 +294,7 @@ - (void)userDidCancelDownload:(SUUpdater *)updater
{
qCInfo(OCC::lcUpdater) << "Checking for updates.";
if (autoUpdaterAllowed()) {
- [_interface->updater checkForUpdates: NSApp];
+ [_interface->updaterController.updater checkForUpdates];
}
}
@@ -303,7 +302,7 @@ - (void)userDidCancelDownload:(SUUpdater *)updater
{
if (autoUpdaterAllowed() && !ConfigFile().skipUpdateCheck()) {
qCInfo(OCC::lcUpdater) << "launching background check";
- [_interface->updater checkForUpdatesInBackground];
+ [_interface->updaterController.updater checkForUpdatesInBackground];
} else {
qCInfo(OCC::lcUpdater) << "not launching background check, auto updater not allowed or update check skipped in config";
}
diff --git a/src/gui/wizard/flow2authwidget.cpp b/src/gui/wizard/flow2authwidget.cpp
index cb9262846d971..e191648e32ad1 100644
--- a/src/gui/wizard/flow2authwidget.cpp
+++ b/src/gui/wizard/flow2authwidget.cpp
@@ -42,8 +42,8 @@ Flow2AuthWidget::Flow2AuthWidget(QWidget *parent)
WizardCommon::initErrorLabel(_ui.errorLabel);
_ui.errorLabel->setTextFormat(Qt::RichText);
- connect(_ui.openLinkLabel, &LinkLabel::clicked, this, &Flow2AuthWidget::slotOpenBrowser);
- connect(_ui.copyLinkLabel, &LinkLabel::clicked, this, &Flow2AuthWidget::slotCopyLinkToClipboard);
+ connect(_ui.openLinkButton, &QPushButton::clicked, this, &Flow2AuthWidget::slotOpenBrowser);
+ connect(_ui.copyLinkButton, &QPushButton::clicked, this, &Flow2AuthWidget::slotCopyLinkToClipboard);
auto sizePolicy = _progressIndi->sizePolicy();
sizePolicy.setRetainSizeWhenHidden(true);
@@ -186,8 +186,8 @@ void Flow2AuthWidget::startSpinner()
_progressIndi->setVisible(true);
_progressIndi->startAnimation();
- _ui.openLinkLabel->setEnabled(false);
- _ui.copyLinkLabel->setEnabled(false);
+ _ui.openLinkButton->setEnabled(false);
+ _ui.copyLinkButton->setEnabled(false);
}
void Flow2AuthWidget::stopSpinner(bool showStatusLabel)
@@ -197,8 +197,8 @@ void Flow2AuthWidget::stopSpinner(bool showStatusLabel)
_progressIndi->setVisible(false);
_progressIndi->stopAnimation();
- _ui.openLinkLabel->setEnabled(_statusUpdateSkipCount == 0);
- _ui.copyLinkLabel->setEnabled(_statusUpdateSkipCount == 0);
+ _ui.openLinkButton->setEnabled(_statusUpdateSkipCount == 0);
+ _ui.copyLinkButton->setEnabled(_statusUpdateSkipCount == 0);
}
void Flow2AuthWidget::slotStyleChanged()
@@ -219,11 +219,9 @@ void Flow2AuthWidget::customizeStyle()
}
}
- _ui.openLinkLabel->setText(tr("Reopen Browser"));
- _ui.openLinkLabel->setAlignment(Qt::AlignCenter);
+ _ui.openLinkButton->setText(tr("Open Browser"));
- _ui.copyLinkLabel->setText(tr("Copy Link"));
- _ui.copyLinkLabel->setAlignment(Qt::AlignCenter);
+ _ui.copyLinkButton->setText(tr("Copy Link"));
WizardCommon::customizeHintLabel(_ui.statusLabel);
}
diff --git a/src/gui/wizard/flow2authwidget.ui b/src/gui/wizard/flow2authwidget.ui
index 44961ddae1a2a..e98f3c6d5e515 100644
--- a/src/gui/wizard/flow2authwidget.ui
+++ b/src/gui/wizard/flow2authwidget.ui
@@ -6,8 +6,8 @@
0
0
- 580
- 330
+ 597
+ 387
@@ -25,31 +25,22 @@
Browser Authentication
-
+
-
-
+
Qt::Vertical
-
- QSizePolicy::Expanding
-
20
- 80
+ 40
-
-
-
- 0
-
-
- 0
-
+
-
@@ -60,12 +51,24 @@
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 32
+
+
+
+
-
12
- 75
true
@@ -80,6 +83,22 @@
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Expanding
+
+
+
+ 20
+ 8
+
+
+
+
-
@@ -94,13 +113,36 @@
-
-
-
- 0
+
+
+ Qt::Vertical
-
- 0
+
+
+ 20
+ 32
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 64
+
+
+
+
+ -
+
-
@@ -115,15 +157,54 @@
-
-
-
- 0
-
+
-
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 9
+
+
+
+ pbSelectLocalFolder
+
+
+ true
+
+
+ false
+
+
-
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 9
+
+
+
+ pbSelectLocalFolder
+
+
+ true
+
+
+ false
+
+
@@ -155,47 +236,26 @@
- -
-
-
-
-
+
Qt::Vertical
-
-
- 20
- 20
-
-
-
-
- -
-
-
- Qt::Vertical
+
+ QSizePolicy::Expanding
20
- 80
+ 60
-
-
- OCC::LinkLabel
- QWidget
-
- 1
-
-
diff --git a/translations/client_ar.ts b/translations/client_ar.ts
index 23506333425a8..e890e6f89b0cf 100644
--- a/translations/client_ar.ts
+++ b/translations/client_ar.ts
@@ -38,14 +38,6 @@
لا توجد أي أنشطة حتى الآن
-
- BasicComboBox
-
-
-
- إمسح قائمة رسالة الحالة
-
-
CallNotificationDialog
@@ -2044,6 +2036,11 @@ This can be an issue with your OpenSSL libraries.
أَعِد فتح المُتصفّح
+
+
+
+ إفتَح المُستعرِض
+
@@ -6468,6 +6465,11 @@ Server replied with error: %2
إخفاء التنزيل
+
+
+
+ حماية بكلمة مرور
+
@@ -7163,6 +7165,14 @@ Server replied with error: %2
قم بتحرير المساحة المحلية
+
+ BasicComboBox
+
+
+
+ إمسح قائمة رسالة الحالة
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_bg.ts b/translations/client_bg.ts
index b1ae9fa1ab01d..2e6e91c94943e 100644
--- a/translations/client_bg.ts
+++ b/translations/client_bg.ts
@@ -38,14 +38,6 @@
Все още няма активности
-
- BasicComboBox
-
-
-
- Изчистване на менюто за съобщения на състояние
-
-
CallNotificationDialog
@@ -2045,6 +2037,11 @@ This can be an issue with your OpenSSL libraries.
Отворете Браузъра отново
+
+
+
+
+
@@ -6474,6 +6471,11 @@ Server replied with error: %2
Скриване на изтеглянето
+
+
+
+
+
@@ -7169,6 +7171,14 @@ Server replied with error: %2
Освобождаване на локално място
+
+ BasicComboBox
+
+
+
+ Изчистване на менюто за съобщения на състояние
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_br.ts b/translations/client_br.ts
index 7f97742fbd6c3..e898d35f81d2b 100644
--- a/translations/client_br.ts
+++ b/translations/client_br.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2037,6 +2029,11 @@ This can be an issue with your OpenSSL libraries.
+
+
+
+
+
@@ -6448,6 +6445,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7143,6 +7145,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index 230f37075e477..d4cd4131124de 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -38,14 +38,6 @@
Encara no hi ha activitats
-
- BasicComboBox
-
-
-
- Esborra el menú del missatge d'estat
-
-
CallNotificationDialog
@@ -2044,6 +2036,11 @@ This can be an issue with your OpenSSL libraries.
+
+
+
+
+
@@ -6449,6 +6446,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7144,6 +7146,14 @@ Server replied with error: %2
Allibera espai local
+
+ BasicComboBox
+
+
+
+ Esborra el menú del missatge d'estat
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 1e757b3dc0861..d5396d52aac46 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -38,14 +38,6 @@
Zatím žádné aktivity
-
- BasicComboBox
-
-
-
- Vyčistit nabídku se stavovými zprávami
-
-
CallNotificationDialog
@@ -2049,6 +2041,11 @@ Toto může být způsobeno problémem s OpenSSL knihovnami.
Znovu otevřít webový prohlížeč
+
+
+
+
+
@@ -6492,6 +6489,11 @@ Server odpověděl chybou: %2
Skrýt stažení
+
+
+
+
+
@@ -7187,6 +7189,14 @@ Server odpověděl chybou: %2
Uvolnit lokální prostor
+
+ BasicComboBox
+
+
+
+ Vyčistit nabídku se stavovými zprávami
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_da.ts b/translations/client_da.ts
index 1a3ac1a3e9cf7..d58589781681c 100644
--- a/translations/client_da.ts
+++ b/translations/client_da.ts
@@ -38,14 +38,6 @@
Ingen aktiviteter endnu
-
- BasicComboBox
-
-
-
- Ryd statusbesked menu
-
-
CallNotificationDialog
@@ -2047,6 +2039,11 @@ Dette kan være et problem med dine OpenSSL biblioteker.
+
+
+
+
+
@@ -6458,6 +6455,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7153,6 +7155,14 @@ Server replied with error: %2
Frigør lokal lagerplads
+
+ BasicComboBox
+
+
+
+ Ryd statusbesked menu
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 9c498c417a703..62fde7bbac629 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -38,14 +38,6 @@
Noch keine Aktivitäten vorhanden
-
- BasicComboBox
-
-
-
- Statusmeldungs-Menü löschen
-
-
CallNotificationDialog
@@ -2049,6 +2041,11 @@ Dies kann ein Problem mit Ihren OpenSSL-Bibliotheken sein.
Browser erneut öffnen
+
+
+
+
+
@@ -6492,6 +6489,11 @@ Server antwortete mit Fehler: %2
Download verbergen
+
+
+
+
+
@@ -7187,6 +7189,14 @@ Server antwortete mit Fehler: %2
Lokalen Speicherplatz freigeben
+
+ BasicComboBox
+
+
+
+ Statusmeldungs-Menü löschen
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_el.ts b/translations/client_el.ts
index aed1948bea066..55443608ce384 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2040,6 +2032,11 @@ This can be an issue with your OpenSSL libraries.
Επανεκκίνηση περιηγητή
+
+
+
+
+
@@ -6456,6 +6453,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7151,6 +7153,14 @@ Server replied with error: %2
Απελευθερώστε τοπικό χώρο
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
index bdda639fc39cc..158174873b6a9 100644
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -38,14 +38,6 @@
No activities yet
-
- BasicComboBox
-
-
-
- Clear status message menu
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ This can be an issue with your OpenSSL libraries.
Reopen Browser
+
+
+
+ Open Browser
+
@@ -6494,6 +6491,11 @@ Server replied with error: %2
Hide download
+
+
+
+ Password protection
+
@@ -7189,6 +7191,14 @@ Server replied with error: %2
Free up local space
+
+ BasicComboBox
+
+
+
+ Clear status message menu
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_eo.ts b/translations/client_eo.ts
index d7ecab3aecf12..f8a5c9e3568d1 100644
--- a/translations/client_eo.ts
+++ b/translations/client_eo.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2036,6 +2028,11 @@ This can be an issue with your OpenSSL libraries.
Remalfermi TTT-legilon
+
+
+
+
+
@@ -6446,6 +6443,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7141,6 +7143,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 3ef92655b17bc..d7c8334996eb7 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -38,14 +38,6 @@
Aún no hay actividades
-
- BasicComboBox
-
-
-
- Borrar el menú de mensajes de estado
-
-
CallNotificationDialog
@@ -2051,6 +2043,11 @@ Esto podría ser un problema con tu librería OpenSSL
Reabrir el navegador
+
+
+
+
+
@@ -6493,6 +6490,11 @@ El servidor respondió con el error: %2
Ocultar descarga
+
+
+
+
+
@@ -7188,6 +7190,14 @@ El servidor respondió con el error: %2
Liberar espacio local
+
+ BasicComboBox
+
+
+
+ Borrar el menú de mensajes de estado
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts
index 5620793f364c4..e7d1526e73191 100644
--- a/translations/client_es_CL.ts
+++ b/translations/client_es_CL.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2036,6 +2028,11 @@ This can be an issue with your OpenSSL libraries.
+
+
+
+
+
@@ -6439,6 +6436,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7134,6 +7136,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts
index 294c1c2438ccc..ec81560931fd8 100644
--- a/translations/client_es_CO.ts
+++ b/translations/client_es_CO.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2036,6 +2028,11 @@ This can be an issue with your OpenSSL libraries.
+
+
+
+
+
@@ -6439,6 +6436,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7134,6 +7136,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts
index 4ba1e140e495f..b074d71e71e26 100644
--- a/translations/client_es_CR.ts
+++ b/translations/client_es_CR.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2036,6 +2028,11 @@ This can be an issue with your OpenSSL libraries.
+
+
+
+
+
@@ -6439,6 +6436,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7134,6 +7136,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts
index 7e45702b614c8..1d22a9a973556 100644
--- a/translations/client_es_DO.ts
+++ b/translations/client_es_DO.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2036,6 +2028,11 @@ This can be an issue with your OpenSSL libraries.
+
+
+
+
+
@@ -6439,6 +6436,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7134,6 +7136,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts
index 430b137009908..011a795508fe9 100644
--- a/translations/client_es_EC.ts
+++ b/translations/client_es_EC.ts
@@ -38,14 +38,6 @@
Aún no hay actividades
-
- BasicComboBox
-
-
-
- Limpiar menú de mensajes de estado
-
-
CallNotificationDialog
@@ -2045,6 +2037,11 @@ This can be an issue with your OpenSSL libraries.
Volver a abrir el navegador
+
+
+
+
+
@@ -6474,6 +6471,11 @@ Server replied with error: %2
Ocultar descarga
+
+
+
+
+
@@ -7169,6 +7171,14 @@ Server replied with error: %2
Liberar espacio local
+
+ BasicComboBox
+
+
+
+ Limpiar menú de mensajes de estado
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts
index 64687a2d60f65..c6898589484cf 100644
--- a/translations/client_es_GT.ts
+++ b/translations/client_es_GT.ts
@@ -38,14 +38,6 @@
Aún no hay actividades
-
- BasicComboBox
-
-
-
- Borrar menú de mensaje de estado
-
-
CallNotificationDialog
@@ -2036,6 +2028,11 @@ This can be an issue with your OpenSSL libraries.
+
+
+
+
+
@@ -6439,6 +6436,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7134,6 +7136,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+ Borrar menú de mensaje de estado
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts
index f0975ac69fbc6..5fc3e2bf49876 100644
--- a/translations/client_es_HN.ts
+++ b/translations/client_es_HN.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2036,6 +2028,11 @@ This can be an issue with your OpenSSL libraries.
+
+
+
+
+
@@ -6439,6 +6436,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7134,6 +7136,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts
index 6a2dbb8e37222..798ad6dfe75ad 100644
--- a/translations/client_es_MX.ts
+++ b/translations/client_es_MX.ts
@@ -38,14 +38,6 @@
Sin actividades todavía
-
- BasicComboBox
-
-
-
- Limpiar menú de mensajes de estado
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Esto podría ser un problema con su librería OpenSSL.
Reabrir el navegador
+
+
+
+
+
@@ -6480,6 +6477,11 @@ El servidor respondió con el error: %2
Ocultar descarga
+
+
+
+
+
@@ -7175,6 +7177,14 @@ El servidor respondió con el error: %2
Liberar espacio local
+
+ BasicComboBox
+
+
+
+ Limpiar menú de mensajes de estado
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts
index 2c6ad4a3a699b..4c5a698423ef9 100644
--- a/translations/client_es_SV.ts
+++ b/translations/client_es_SV.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2036,6 +2028,11 @@ This can be an issue with your OpenSSL libraries.
+
+
+
+
+
@@ -6439,6 +6436,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7134,6 +7136,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index 663346cb2906f..2eb6e41995b1e 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -38,14 +38,6 @@
Ez dago jarduerarik oraindik
-
- BasicComboBox
-
-
-
- Garbitu egoera mezuaren menua
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Baliteke OpenSSL liburutegiekin arazoa egotea.
Berrireki nabigatzailea
+
+
+
+
+
@@ -6490,6 +6487,11 @@ Zerbitzariak errorearekin erantzun du: %2
Ezkutuko deskarga
+
+
+
+
+
@@ -7185,6 +7187,14 @@ Zerbitzariak errorearekin erantzun du: %2
Egin leku librea lokalean
+
+ BasicComboBox
+
+
+
+ Garbitu egoera mezuaren menua
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 77df9e0d3db9b..c4ceea3222993 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -38,14 +38,6 @@
No activities yet
-
- BasicComboBox
-
-
-
- Clear status message menu
-
-
CallNotificationDialog
@@ -2046,6 +2038,11 @@ This can be an issue with your OpenSSL libraries.
Reopen Browser
+
+
+
+
+
@@ -6473,6 +6470,11 @@ Server replied with error: %2
Hide download
+
+
+
+
+
@@ -7168,6 +7170,14 @@ Server replied with error: %2
Free up local space
+
+ BasicComboBox
+
+
+
+ Clear status message menu
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index e69589d909cb9..970efbd36d174 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
- Tyhjennä tilaviestien valikko
-
-
CallNotificationDialog
@@ -2043,6 +2035,11 @@ OpenSSL-kirjastosi kanssa saattaa olla ongelma.
Avaa selain uudelleen
+
+
+
+
+
@@ -6450,6 +6447,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7145,6 +7147,14 @@ Server replied with error: %2
Vapauta paikallista tilaa
+
+ BasicComboBox
+
+
+
+ Tyhjennä tilaviestien valikko
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 2ed4044769a9e..6673b79a7aa51 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -38,14 +38,6 @@
Pas encore d'activité
-
- BasicComboBox
-
-
-
- Menu d'effacement du message de statut
-
-
CallNotificationDialog
@@ -2048,6 +2040,11 @@ Cela peut être un problème avec vos bibliothèques OpenSSL.
Rouvrir le navigateur
+
+
+
+
+
@@ -6489,6 +6486,11 @@ Le serveur a répondu avec l'erreur : %2
Masquer le téléchargement
+
+
+
+
+
@@ -7184,6 +7186,14 @@ Le serveur a répondu avec l'erreur : %2
Libérer de l'espace local
+
+ BasicComboBox
+
+
+
+ Menu d'effacement du message de statut
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_ga.ts b/translations/client_ga.ts
index 38e972ad46018..2f1c63195afbb 100644
--- a/translations/client_ga.ts
+++ b/translations/client_ga.ts
@@ -38,14 +38,6 @@
Níl aon ghníomhaíochtaí fós
-
- BasicComboBox
-
-
-
- Glan an roghchlár teachtaireacht stádais
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Féadfaidh sé seo a bheith ina fhadhb le do leabharlanna OpenSSL.
Athoscail Brabhsálaí
+
+
+
+ Oscail Brabhsálaí
+
@@ -6494,6 +6491,11 @@ D'fhreagair an freastalaí le hearráid: % 2
Folaigh íoslódáil
+
+
+
+ Cosaint pasfhocal
+
@@ -7189,6 +7191,14 @@ D'fhreagair an freastalaí le hearráid: % 2
Saor suas spás áitiúil
+
+ BasicComboBox
+
+
+
+ Glan an roghchlár teachtaireacht stádais
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 94bc670b4d4c7..9e6a59819ae12 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -38,14 +38,6 @@
Aínda non hai actividades
-
- BasicComboBox
-
-
-
- Limpar o menú de mensaxes de estado
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Isto pode ser un problema coas súas bibliotecas OpenSSL.
Volver abrir o navegador
+
+
+
+
+
@@ -6490,6 +6487,11 @@ O servidor respondeu co erro: %2
Agochar a descarga
+
+
+
+
+
@@ -7185,6 +7187,14 @@ O servidor respondeu co erro: %2
Liberar espazo local
+
+ BasicComboBox
+
+
+
+ Limpar o menú de mensaxes de estado
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_he.ts b/translations/client_he.ts
index 6428524306877..e5596abc94660 100644
--- a/translations/client_he.ts
+++ b/translations/client_he.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2039,6 +2031,11 @@ This can be an issue with your OpenSSL libraries.
פתיחת דפדפן מחדש
+
+
+
+
+
@@ -6444,6 +6441,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7139,6 +7141,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_hr.ts b/translations/client_hr.ts
index d76601b7b4626..32c8d5ff81183 100644
--- a/translations/client_hr.ts
+++ b/translations/client_hr.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2044,6 +2036,11 @@ Možda se radi o pogrešci u radu OpenSSL biblioteka.
Ponovno otvori preglednik
+
+
+
+
+
@@ -6471,6 +6468,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7166,6 +7168,14 @@ Server replied with error: %2
Oslobodi lokalni prostor za pohranu
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index 033d65b55e8f3..b143263d21dd8 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -38,14 +38,6 @@
Még nincsenek tevékenységek
-
- BasicComboBox
-
-
-
- Állapotüzenet-menü ürítése
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Ezt a problémát valószínűleg az OpenSSL programkönyvtárakban kell keresni
Böngésző újranyitása
+
+
+
+
+
@@ -6492,6 +6489,11 @@ A kiszolgáló hibával válaszolt: %2
Letöltés elrejtése
+
+
+
+
+
@@ -7187,6 +7189,14 @@ A kiszolgáló hibával válaszolt: %2
Hely felszabadítása ezen az eszközön
+
+ BasicComboBox
+
+
+
+ Állapotüzenet-menü ürítése
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_is.ts b/translations/client_is.ts
index 3d6cbc86debdd..54db42df485e9 100644
--- a/translations/client_is.ts
+++ b/translations/client_is.ts
@@ -38,14 +38,6 @@
Engar athafnir ennþá
-
- BasicComboBox
-
-
-
- Hreinsa valmynd stöðuskilaboða
-
-
CallNotificationDialog
@@ -2046,6 +2038,11 @@ This can be an issue with your OpenSSL libraries.
Enduropna vafra
+
+
+
+
+
@@ -6453,6 +6450,11 @@ Server replied with error: %2
Fela niðurhal
+
+
+
+
+
@@ -7151,6 +7153,14 @@ sjálfgefið?
+
+ BasicComboBox
+
+
+
+ Hreinsa valmynd stöðuskilaboða
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 6bd1de47a981e..3da1bb1ba3194 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -38,14 +38,6 @@
Ancora nessuna attività
-
- BasicComboBox
-
-
-
- Cancella il messaggio di stato
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Questo può essere un problema delle le tue librerie OpenSSL.
Riapri browser
+
+
+
+ Apri il browser
+
@@ -6486,6 +6483,11 @@ Il server ha risposto con errore: %2
Nascondi scaricamento
+
+
+
+ Protezione con password
+
@@ -7181,6 +7183,14 @@ Il server ha risposto con errore: %2
Libera spazio locale
+
+ BasicComboBox
+
+
+
+ Cancella il messaggio di stato
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index 0435297bda27a..ba69b3bad8bc8 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -38,14 +38,6 @@
まだアクティビティはありません
-
- BasicComboBox
-
-
-
- メニューのステータスメッセージの削除
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ This can be an issue with your OpenSSL libraries.
ブラウザーを再度開く
+
+
+
+
+
@@ -2491,7 +2488,10 @@ Alternatively, you can restore all deleted files by downloading them from the se
This setup can cause data loss and it is no longer supported.
To resolve this issue: please remove %1 from one of the accounts and create a new sync folder.
For advanced users: this issue might be related to multiple sync database files found in one folder. Please check %1 for outdated and unused .sync_*.db files and remove them.
-
+ %1フォルダは複数のアカウントにリンクされています。
+この設定はデータ損失の原因となる可能性があり、現在はサポートされていません。
+この問題を解決するには:%1をいずれかのアカウントから削除し、新しい同期フォルダを作成してください。
+上級者向け:この問題は、1つのフォルダに複数の同期データベースファイルがあることが原因である可能性があります。%1に古くて使用されていない.sync_*.dbファイルがないか確認し、削除してください。
@@ -4393,7 +4393,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
-
+ 不明な例外
@@ -4527,7 +4527,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
-
+ 不明な例外
@@ -6490,6 +6490,11 @@ Server replied with error: %2
ダウンロードを隠す
+
+
+
+
+
@@ -7185,6 +7190,14 @@ Server replied with error: %2
ローカル領域の確保
+
+ BasicComboBox
+
+
+
+ メニューのステータスメッセージの削除
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_ko.ts b/translations/client_ko.ts
index b8284e988d4f4..0bff58220547d 100644
--- a/translations/client_ko.ts
+++ b/translations/client_ko.ts
@@ -38,14 +38,6 @@
활동 없음
-
- BasicComboBox
-
-
-
- 상태 메시지 메뉴 지우기
-
-
CallNotificationDialog
@@ -2049,6 +2041,11 @@ OpenSSL 라이브러리 이슈일 수 있습니다.
브라우저를 다시 열기
+
+
+
+
+
@@ -6492,6 +6489,11 @@ Server replied with error: %2
다운로드 숨기기
+
+
+
+
+
@@ -7187,6 +7189,14 @@ Server replied with error: %2
로컬 저장공간 확보
+
+ BasicComboBox
+
+
+
+ 상태 메시지 메뉴 지우기
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts
index 70b558892523e..a7060db3b7c3e 100644
--- a/translations/client_lt_LT.ts
+++ b/translations/client_lt_LT.ts
@@ -38,14 +38,6 @@
Kol kas nėra veiklų
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -1385,13 +1377,13 @@ This action will abort any currently running synchronization.
-
+ failas A
-
+ šiandiena
@@ -1403,7 +1395,7 @@ This action will abort any currently running synchronization.
-
+ Atverti esamą failą
@@ -1429,7 +1421,7 @@ This action will abort any currently running synchronization.
-
+ Naujas failo pavadinimas
@@ -2039,6 +2031,11 @@ This can be an issue with your OpenSSL libraries.
Atverti naršyklę iš naujo
+
+
+
+
+
@@ -6448,6 +6445,11 @@ Server replied with error: %2
Slėpti atsiuntimą
+
+
+
+
+
@@ -7143,6 +7145,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_lv.ts b/translations/client_lv.ts
index e736c5954b245..77f3b36a0cd6f 100644
--- a/translations/client_lv.ts
+++ b/translations/client_lv.ts
@@ -38,14 +38,6 @@
Vēl nav darbību
-
- BasicComboBox
-
-
-
- Notīrīt statusa ziņojumu izvēlni
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Varētu būt problēma ar jūsu OpenSSL bibliotēkām.
Atkārtoti atvērt pārlūku
+
+
+
+
+
@@ -6457,6 +6454,11 @@ Server replied with error: %2
Paslēpt lejupielādi
+
+
+
+
+
@@ -7152,6 +7154,14 @@ Server replied with error: %2
Atbrīvojiet lokālo vietu
+
+ BasicComboBox
+
+
+
+ Notīrīt statusa ziņojumu izvēlni
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_mk.ts b/translations/client_mk.ts
index f39b9a0eecc4b..783f706a1e2e4 100644
--- a/translations/client_mk.ts
+++ b/translations/client_mk.ts
@@ -38,14 +38,6 @@
Сеуште нема активности
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2038,6 +2030,11 @@ This can be an issue with your OpenSSL libraries.
Повторно отвори го прелистувачот
+
+
+
+
+
@@ -6446,6 +6443,11 @@ Server replied with error: %2
Сокриј преземање
+
+
+
+
+
@@ -7141,6 +7143,14 @@ Server replied with error: %2
Ослободете простор од локалниот диск
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 5ea39726d747f..9d566ba3ee7d3 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -38,14 +38,6 @@
Ingen aktiviteter ennå
-
- BasicComboBox
-
-
-
- Slett statusmeldingsmeny
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Dette kan være et problem med OpenSSL-bibliotekene dine.
Gjenåpne nettleser
+
+
+
+
+
@@ -6479,6 +6476,11 @@ Server svarte med feil: %2
Skjul nedlasting
+
+
+
+
+
@@ -7174,6 +7176,14 @@ Server svarte med feil: %2
Frigjør lokal plass
+
+ BasicComboBox
+
+
+
+ Slett statusmeldingsmeny
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index f8f4fa7483791..b0a9a07526872 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -38,14 +38,6 @@
Nog geen activiteiten
-
- BasicComboBox
-
-
-
- Menu Statusbericht wissen
-
-
CallNotificationDialog
@@ -2046,6 +2038,11 @@ Dit kan een probleem zijn met je OpenSSL-bibliotheken.
Heropen browser
+
+
+
+
+
@@ -6476,6 +6473,11 @@ Server antwoordde met fout: %2
Verberg download
+
+
+
+
+
@@ -7171,6 +7173,14 @@ Server antwoordde met fout: %2
Lokale ruimte vrijmaken
+
+ BasicComboBox
+
+
+
+ Menu Statusbericht wissen
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_oc.ts b/translations/client_oc.ts
index 2ed738b08a56c..9740fddf7cc37 100644
--- a/translations/client_oc.ts
+++ b/translations/client_oc.ts
@@ -38,14 +38,6 @@
Cap d’activitat pel moment
-
- BasicComboBox
-
-
-
- Escafar lo menú de messatge d’estatut
-
-
CallNotificationDialog
@@ -2036,6 +2028,11 @@ This can be an issue with your OpenSSL libraries.
Tornar dobrir lo navegador
+
+
+
+
+
@@ -6437,6 +6434,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7132,6 +7134,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+ Escafar lo menú de messatge d’estatut
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index 742d4c333fead..da41709f3ad83 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -38,14 +38,6 @@
Brak aktywności
-
- BasicComboBox
-
-
-
- Wyczyść menu komunikatu statusu
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Może to być problem z bibliotekami OpenSSL.
Otwórz ponownie przeglądarkę
+
+
+
+
+
@@ -6480,6 +6477,11 @@ Serwer odpowiedział błędem: %2
Ukryj pobieranie
+
+
+
+
+
@@ -7175,6 +7177,14 @@ Serwer odpowiedział błędem: %2
Zwolnij miejsce lokalne
+
+ BasicComboBox
+
+
+
+ Wyczyść menu komunikatu statusu
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 51c7d7ab7fb48..187e77ac007be 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -38,14 +38,6 @@
Ainda sem atividade
-
- BasicComboBox
-
-
-
- Limpar menu de mensagem de estado
-
-
CallNotificationDialog
@@ -2037,6 +2029,11 @@ This can be an issue with your OpenSSL libraries.
+
+
+
+
+
@@ -6442,6 +6439,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7137,6 +7139,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+ Limpar menu de mensagem de estado
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index 40777499bbf38..34c835b5a0552 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -38,14 +38,6 @@
Nenhuma atividade ainda
-
- BasicComboBox
-
-
-
- Limpar menu de mensagem de status
-
-
CallNotificationDialog
@@ -2046,6 +2038,11 @@ Isso pode ser um problema com suas bibliotecas OpenSSL.
Reabrir Navegador
+
+
+
+
+
@@ -6485,6 +6482,11 @@ Servidor respondeu com erro: %2
Ocultar enviar
+
+
+
+
+
@@ -7180,6 +7182,14 @@ Servidor respondeu com erro: %2
Libere espaço local
+
+ BasicComboBox
+
+
+
+ Limpar menu de mensagem de status
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_ro.ts b/translations/client_ro.ts
index bf9c137f63fcc..4efbcc354e116 100644
--- a/translations/client_ro.ts
+++ b/translations/client_ro.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2044,6 +2036,11 @@ Aceasta poate fi o problemă cu librariile OpenSSL.
Re-deschide Browser-ul
+
+
+
+
+
@@ -6452,6 +6449,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7147,6 +7149,14 @@ Server replied with error: %2
Eliberați spațiu local
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index df205a15089db..1559d1f5ed6ff 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -38,14 +38,6 @@
Пока ничего не делалось
-
- BasicComboBox
-
-
-
- Меню отчистки статуса сообщения
-
-
CallNotificationDialog
@@ -2048,6 +2040,11 @@ This can be an issue with your OpenSSL libraries.
Повторно открыть браузер
+
+
+
+
+
@@ -6485,6 +6482,11 @@ Server replied with error: %2
Скрыть закачку
+
+
+
+
+
@@ -7180,6 +7182,14 @@ Server replied with error: %2
Освободить место на локальном диске
+
+ BasicComboBox
+
+
+
+ Меню отчистки статуса сообщения
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_sc.ts b/translations/client_sc.ts
index 1480ae6e7165c..ca5290609c975 100644
--- a/translations/client_sc.ts
+++ b/translations/client_sc.ts
@@ -38,14 +38,6 @@
-
- BasicComboBox
-
-
-
-
-
-
CallNotificationDialog
@@ -2044,6 +2036,11 @@ Custu podet èssere un'errore de is librerias tuas OpenSSL.
Torra a abèrrere su navigadore
+
+
+
+
+
@@ -6471,6 +6468,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7166,6 +7168,14 @@ Server replied with error: %2
Faghe logu
+
+ BasicComboBox
+
+
+
+
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index a169383e1e5cf..f7a7317f57917 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -38,14 +38,6 @@
Zatiaľ žiadna aktivita
-
- BasicComboBox
-
-
-
- Vymazať menu správ o stave
-
-
CallNotificationDialog
@@ -223,7 +215,7 @@
-
+ Prepínač účtov a menu nastavení
@@ -467,12 +459,12 @@
-
+ Hlavné dialógové okno pracovnej plochy Nextcloud
-
+ Jednotný zoznam výsledkov vyhľadávania
@@ -2050,6 +2042,11 @@ Môže to byť problém s knižnicami OpenSSL.
Znovu otvoriť prehliadač
+
+
+
+
+
@@ -2281,14 +2278,18 @@ To znamená, že klient synchronizácie nemusí okamžite odovzdať lokálne zme
-
+ Veľký počet súborov na serveri bol odstránený.
+Potvrďte, či chcete pokračovať v tomto odstraňovaní.
+Prípadne môžete obnoviť všetky vymazané súbory ich nahraním z adresára '%1' na server.
-
+ Veľký počet súborov vo vašom miestnom adresáre '%1' bolo odstránených.
+Potvrďte, či chcete pokračovať v tomto odstraňovaní.
+Prípadne môžete obnoviť všetky odstránené súbory ich stiahnutím zo servera.
@@ -2449,7 +2450,7 @@ Alternatively, you can restore all deleted files by downloading them from the se
-
+ Adresár %1 sa používa v pripojení na synchronizáciu adresára!
@@ -2487,7 +2488,10 @@ Alternatively, you can restore all deleted files by downloading them from the se
This setup can cause data loss and it is no longer supported.
To resolve this issue: please remove %1 from one of the accounts and create a new sync folder.
For advanced users: this issue might be related to multiple sync database files found in one folder. Please check %1 for outdated and unused .sync_*.db files and remove them.
-
+ Adresár %1 je prepojený s viacerými účtami.
+Toto nastavenie môže spôsobiť stratu údajov a už nie je podporované.
+Ak chcete vyriešiť tento problém, odstráňte %1 z jedného z účtov a vytvorte nový synchronizačný adresár.
+Pre pokročilých užívateľov: tento problém môže súvisieť s viacerými synchronizačnými databázovými súbormi nachádzajúcimi sa v jednom adresáre. Skontrolujte %1 na zastarané a nepoužívané súbory .sync_*.db a odstráňte ich.
@@ -2910,7 +2914,7 @@ For advanced users: this issue might be related to multiple sync database files
-
+ Zobraziť upozornenia na Chat
@@ -3052,7 +3056,7 @@ For advanced users: this issue might be related to multiple sync database files
-
+ Zobraziť dialógy upozornenia na Chat.
@@ -3107,7 +3111,10 @@ Upozorňujeme, že sa tým vyberie iba to, odkiaľ sa aktualizácie budú sťaho
Downgrading versions is not possible immediately: changing from beta to stable means waiting for the new stable version.
list of available update channels to non enterprise users and downgrading warning
-
+ - beta: obsahuje verzie s novými funkciami, ktoré nemusia byť dôkladne testované
+- denne: obsahuje verzie vytvorené denne, len pre testovanie a vývoj
+
+Prechod na nižšiu verziu nie je možný okamžite: zmena z beta na stabilnú znamená čakanie na novú stabilnú verziu.
@@ -3115,7 +3122,9 @@ Downgrading versions is not possible immediately: changing from beta to stable m
Downgrading versions is not possible immediately: changing from stable to enterprise means waiting for the new enterprise version.
list of available update channels to enterprise users and downgrading warning
-
+ - Enterprise: obsahuje stabilné verzie pre zákazníkov.
+
+Prechod na nižšiu verziu nie je možný okamžite: zmena zo stabilnej na podnikovú znamená čakanie na novú podnikovú verziu.
@@ -3338,27 +3347,27 @@ Položky, pri ktorých je povolené odstraňovanie budú vymazané, ak bránia o
-
+ Súbor "%1" nebolo možné synchronizovať, pretože názov obsahuje znaky, ktoré nie sú povolené serverom.
-
+ Nasledujúce znaky nie sú povolené: %1
-
+ Nasledujúce názvy nie su povolené: %1
-
+ Nasledujúce názvy súborov nie su povolené: %1
-
+ Nasledujúce prípony súborov nie su povolené: %1
@@ -3492,32 +3501,32 @@ Upozorňujeme, že použitie akýchkoľvek príkazov pre logovanie z príkazové
-
+ Nepodarilo sa spustiť lokálnu úpravu.
-
+ Počas nastavovania sa vyskytla chyba.
-
+ Nepodarilo sa nájsť súbor pre lokálne úpravy. Uistite sa, že jeho cesta je platná a je synchronizovaná lokálne.
-
+ Nepodarilo sa získať ID súboru.
-
+ Nepodarilo sa získať identifikátor súboru.
-
+ Identifikátor súboru je prázdny.
@@ -4181,7 +4190,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character
-
+ Názov %1 obsahuje znak "%2" ktorý nie je podporovaný na tomto súborovom systéme.
@@ -4251,12 +4260,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
-
+ Dôvod: meno súboru obsahuje zakázaný názov (začiatok názvu súboru).
-
+ Dôvod: súbor obsahuje zakázanú príponu (.%1).
@@ -4385,7 +4394,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
-
+ neznáma chyba
@@ -4519,7 +4528,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
-
+ neznáma chyba
@@ -4550,7 +4559,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
-
+ Adresár %1 nemôže byť premenovaný z dôvodu kolízie s menom lokálneho súboru alebo adresára.
@@ -5708,7 +5717,7 @@ Server odpovedal chybou: %2
-
+ Nepodarilo sa pridať alebo odstrániť užívateľa %1 pre prístup k adresáru %2
@@ -5875,7 +5884,7 @@ Server odpovedal chybou: %2
-
+ Funkcia virtuálneho systému súborov nepodporuje jednotku ako koreňový adresár pre synchronizáciu
@@ -5885,7 +5894,7 @@ Server odpovedal chybou: %2
-
+ Funkcia virtuálneho systému súborov nie je podporovaná na sieťových jednodkách
@@ -6033,7 +6042,7 @@ Server odpovedal chybou: %2
-
+ Váš účet %1 vyžaduje, aby ste prijali zmluvné podmienky vášho servera. Budete presmerovaní na %2, aby ste potvrdili, že ste si ho prečítali a súhlasíte s ním.
@@ -6289,12 +6298,12 @@ Server odpovedal chybou: %2
-
+ Archív informácií pre ladenie sa nepodarilo vytvoriť
-
+ Archív informácií pre ladenie sa nepodarilo vytvoriť vo vybranej lokácii!
@@ -6482,6 +6491,11 @@ Server odpovedal chybou: %2
Skryť sťahovanie
+
+
+
+
+
@@ -6957,7 +6971,7 @@ Server odpovedal chybou: %2
-
+ Lokálne metadáta virtuálných súborov boli aktualizované
@@ -7177,6 +7191,14 @@ Server odpovedal chybou: %2
Uvoľniť lokálny priestor
+
+ BasicComboBox
+
+
+
+ Vymazať menu správ o stave
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index 7a216d3b5aaec..5e06b0838a4cd 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -38,14 +38,6 @@
Ni še zabeležene dejavnosti
-
- BasicComboBox
-
-
-
- Počisti meni sporočil stanja
-
-
CallNotificationDialog
@@ -2044,6 +2036,11 @@ Morda je napaka v knjužnicah OpenSSL.
Ponovno odpri brskalnik
+
+
+
+
+
@@ -6471,6 +6468,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7166,6 +7168,14 @@ Server replied with error: %2
Sprostite krajevno shrambo
+
+ BasicComboBox
+
+
+
+ Počisti meni sporočil stanja
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index 55f79b73a6f10..41366c2af8187 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -38,14 +38,6 @@
Још увек нема активности
-
- BasicComboBox
-
-
-
- Обриши мени статусне поруке
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ This can be an issue with your OpenSSL libraries.
Поново отвори прегледач
+
+
+
+
+
@@ -6491,6 +6488,11 @@ Server replied with error: %2
Сакриј преузимање
+
+
+
+
+
@@ -7186,6 +7188,14 @@ Server replied with error: %2
Ослободи локални простор
+
+ BasicComboBox
+
+
+
+ Обриши мени статусне поруке
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 7ec6bba84a55c..511e2a2b129af 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -38,14 +38,6 @@
Inga aktiviteter än
-
- BasicComboBox
-
-
-
- Rensa statusmeddelandemenyn
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Det kan vara problem med dina OpenSSL-bibliotek.
Öppna webbläsaren igen
+
+
+
+ Öppna webbläsare
+
@@ -6494,6 +6491,11 @@ Servern svarade med fel: %2
Dölj nedladdning
+
+
+
+ Lösenordsskydd
+
@@ -7189,6 +7191,14 @@ Servern svarade med fel: %2
Frigör lokalt utrymme
+
+ BasicComboBox
+
+
+
+ Rensa statusmeddelandemenyn
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 045ac3b49828d..a69e3e83dd113 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -38,14 +38,6 @@
ยังไม่มีกิจกรรม
-
- BasicComboBox
-
-
-
- ล้างเมนูข้อความสถานะ
-
-
CallNotificationDialog
@@ -2042,6 +2034,11 @@ This can be an issue with your OpenSSL libraries.
เปิดเบราว์เซอร์อีกครั้ง
+
+
+
+
+
@@ -6446,6 +6443,11 @@ Server replied with error: %2
+
+
+
+
+
@@ -7141,6 +7143,14 @@ Server replied with error: %2
+
+ BasicComboBox
+
+
+
+ ล้างเมนูข้อความสถานะ
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index b3bacd72693ac..bd71de9ad15f7 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -38,14 +38,6 @@
Henüz bir işlem yok
-
- BasicComboBox
-
-
-
- Durum iletisini kaldırma menüsü
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ Bu durum OpenSLL kitaplıkları ile ilgili bir sorun olabilir.
Tarayıcıyı yeniden aç
+
+
+
+
+
@@ -6493,6 +6490,11 @@ Sunucunun verdiği hata yanıtı: %2
İndirme gizlensin
+
+
+
+
+
@@ -7188,6 +7190,14 @@ Sunucunun verdiği hata yanıtı: %2
Yerelden kaldırıp yer aç
+
+ BasicComboBox
+
+
+
+ Durum iletisini kaldırma menüsü
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_ug.ts b/translations/client_ug.ts
index 2e07d098f00d6..2e2f2417fc641 100644
--- a/translations/client_ug.ts
+++ b/translations/client_ug.ts
@@ -38,14 +38,6 @@
تېخى پائالىيەت يوق
-
- BasicComboBox
-
-
-
- ھالەت ئۇچۇر تىزىملىكىنى تازىلاش
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ This can be an issue with your OpenSSL libraries.
توركۆرگۈنى قايتا ئېچىڭ
+
+
+
+
+
@@ -6491,6 +6488,11 @@ Server replied with error: %2
چۈشۈرۈشنى يوشۇرۇش
+
+
+
+
+
@@ -7186,6 +7188,14 @@ Server replied with error: %2
يەرلىك بوشلۇقنى ھەقسىز قىلىڭ
+
+ BasicComboBox
+
+
+
+ ھالەت ئۇچۇر تىزىملىكىنى تازىلاش
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index 378e2edf06961..ca5fafabf4518 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -38,14 +38,6 @@
Поки не було дій
-
- BasicComboBox
-
-
-
- Очистити меню статусних повідомлень
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ This can be an issue with your OpenSSL libraries.
Відкрити бравзер наново
+
+
+
+
+
@@ -2491,7 +2488,10 @@ Alternatively, you can restore all deleted files by downloading them from the se
This setup can cause data loss and it is no longer supported.
To resolve this issue: please remove %1 from one of the accounts and create a new sync folder.
For advanced users: this issue might be related to multiple sync database files found in one folder. Please check %1 for outdated and unused .sync_*.db files and remove them.
-
+ Каталог %1 використовується кількома користувачами.
+Така конфігурація може призвети до втрати даних, відтак більше не підтримується.
+Для вирішення проблеми потрібно вилучити каталог %1 з одного з облікових записів та створити новий каталог для синхронізації.
+Для експертів: проблема може полягати в тому, що кілька файлів синхронізації баз даних розташовано в одному каталозі. Перевірте, каталог %1 містить застарілі та невикористовувані файли .sync_*.db, вилучіть їх.
@@ -4392,7 +4392,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
-
+ невідомий виняток
@@ -4526,7 +4526,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
-
+ невідомий виняток
@@ -6489,6 +6489,11 @@ Server replied with error: %2
Приховати звантаження
+
+
+
+
+
@@ -7184,6 +7189,14 @@ Server replied with error: %2
Звільнити місце на пристрої
+
+ BasicComboBox
+
+
+
+ Очистити меню статусних повідомлень
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 110f31e2da138..e1d01d5c3407b 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -38,14 +38,6 @@
暂无动态
-
- BasicComboBox
-
-
-
- 清除状态信息菜单
-
-
CallNotificationDialog
@@ -2046,6 +2038,11 @@ This can be an issue with your OpenSSL libraries.
重新打开浏览器
+
+
+
+
+
@@ -6479,6 +6476,11 @@ Server replied with error: %2
隐藏下载
+
+
+
+
+
@@ -7174,6 +7176,14 @@ Server replied with error: %2
释放本地空间
+
+ BasicComboBox
+
+
+
+ 清除状态信息菜单
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts
index 384e55ea2baa9..b1a14434542dd 100644
--- a/translations/client_zh_HK.ts
+++ b/translations/client_zh_HK.ts
@@ -38,14 +38,6 @@
尚無系統事件
-
- BasicComboBox
-
-
-
- 清除狀態訊息選項單
-
-
CallNotificationDialog
@@ -2052,6 +2044,11 @@ This can be an issue with your OpenSSL libraries.
重新開啟瀏覽器
+
+
+
+ 開啟瀏覽器
+
@@ -6495,6 +6492,11 @@ Server replied with error: %2
隱藏下載
+
+
+
+ 密碼保護
+
@@ -7190,6 +7192,14 @@ Server replied with error: %2
釋放近端存儲空間
+
+ BasicComboBox
+
+
+
+ 清除狀態訊息選項單
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index fb27872eb972a..9d94adc46e4f4 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -38,14 +38,6 @@
尚無活動狀態
-
- BasicComboBox
-
-
-
- 清除狀態訊息選單
-
-
CallNotificationDialog
@@ -2050,6 +2042,11 @@ This can be an issue with your OpenSSL libraries.
重新開啟瀏覽器
+
+
+
+ 開啟瀏覽器
+
@@ -6494,6 +6491,11 @@ Server replied with error: %2
隱藏下載
+
+
+
+ 密碼保護
+
@@ -7189,6 +7191,14 @@ Server replied with error: %2
釋放本機空間
+
+ BasicComboBox
+
+
+
+ 清除狀態訊息選單
+
+
OCC::AbstractPropagateRemoteDeleteEncrypted